Fix for messaging error messages