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

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