More consistent error reporting