azure error handling fix #2