Better error message code.  Remove commented out code.