Fix initial error reporting