atfathima Refactor and delete silly error messages