am c51556aa: am ca04f74a: Merge "Make sure the exception is a CommandException before casting it to one." into lmp-mr1-dev

* commit 'c51556aaff57ce0ae61a859e75f13e4e74182c81':
  Make sure the exception is a CommandException before casting it to one.