Fix error handling to send back Msgs