refactored error message code for slightly more consistency, and to fix the := problem