Prevent NPEs when working with server-side messages
Update build