Adjusting commit after Ian suggestions

Combined Exception with Timeout on _disconnect