Attempted fix for the client crash with the new protocols.