Fix server unavailable error handling