Improve exception message

Change-Id: I06ffe3088546d55b29d61ccfae16937d8a7ce9e8