azure error handling fix #1