Fixed matt's typo that broke compilation
Fixed the exception on disconnect
Merge branch 'master' into T1