Adding failure handling cases for disconnects