One more fix
Merge branch 'azureerrorsfix'