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

* commit 'c319ddd9ec9c630840a11765a4630b1375fe9664':