Merge "Handle exceptions other than CommandException" into lmp-mr1-dev