Further improved error reporting