Improve error messages

* Half of the error messages didn't actually exist
* There were some inconsistencies
* ...

Only did minor work; errors should probably still be improved drastically :)

Change-Id: I6473b27eb7a349becefc76155bfb2cc797215796
Merge "Improve error messages"