Provider; Disabled event saving before initialization; Error handling fix