Merge "Handle exceptions other than CommandException" into lmp-mr1-dev
automerge: 75ce5b6

* commit '75ce5b65468e421a80d2cf4a66c50063445dc3a4':
  Handle exceptions other than CommandException