MSE-7 Add graceful disconnects