Additional error handling + msg layout changes