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

* commit '8d25eab10523ac2424dc645dc697126dbadad588':
  Releasing lock even if exception is thrown.