Fixed hanging shutdown when data service is not reachable