Merge "Change the exception msg" into klp-dev