Make some error messages a bit more accurate