2nd  Possible fix for server crash related to client things attempting to register in it.

Tries to fix Issue #4