Fixed a little bit of the error handling of the messaging
Comments.
A bit of cleaning