Added support for handling server downtime