Save Dialog Close Crashes
Modify null checks