am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"

* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block