Simplified error message code, to work more consistently.