am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."

* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
  Releasing lock even if exception is thrown.