Changed NetworkHandler to fail instead of silently trying again