Attempt to fix crash on message receipt