Add some fancier error reporting