Make error messages even better!

Change-Id: I72bd1eb1d526dc59833e5bc3c636171f7f9545af
30 files changed