Improve handling of lock exceptions