Improve exception msg

Change-Id: I4edbecd0ca3006c24fd5920a9ef9ad1fdc6016fb