A more failsafe client