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

* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block