enhance exception message

Change-Id: I90be843977fc1872e1231ab7f7ce52e00d79aee7