Changed the error messages that are shown to the user.
Removed the debuging code on message directive.