Added support for service unavailable error