am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev

* commit '7e1ae00c5e34d50500cf00c83e41d589b61b88b9':
  Throw error when no intent can be found