Add message to exception

Change-Id: I0e7cf850b51343e4afc1ea0a0409ad2c4e596435