Fix for a small crash on reconnect
Small number of changes made inline with the Cranium Project