Changed exception

Change-Id: I62fbfe84720cbb063214350e05c9310b8458c471