Improved AzureSB error mgmt