Attempted fix for the client crash with the new protocols.
Merge branch 'master' into UUID-Changes