Client disconnect bug fixed

-reverted for testing exceptionhandler
-re-implemented fix