Fix error handling when a service anavailable error occured