Tweaked error reporting