Fix incoming message error handling