Removed currently working comments
Added proper error handling to message handler