Fix internal error reporting to say what general function the error occurred in.