Fix for a small crash on reconnect
Small number of changes made inline with the Cranium Project
Added a missing exception Handle
Fixes to the client to stop a memory leak for reconnecting clients
Minor cleanup
Merge branch 'development'