Rel 1.4.2 - changes to fix exception when using Azure.