Improve the error reporting a tiny bit