Merge "Throw error when no intent can be found" into lmp-dev