MP: Can now handle disconnection more gracefully