Improve error message.

Change-Id: I3ae9b4d9ab82e7af5aa911ccb411cafeb92147b9