Improved Failed connection Handling (Azure)