am 4c737496: Merge "Change the exception msg" into klp-dev

* commit '4c737496142085a7354e6aa663c09b5dd5a83633':
  Change the exception msg