Fixing parser issue for the body of the message, better error logs