Bug fixes around catching storage errors correctly in azure store