Improve error messages. am: 457a5e3334 am: dc9cb4f308
am: 5839b2b26f

Change-Id: I5d1925640cf0c6ff462897e5b129ee4fbaaed251