Fixed a few spots which could cause app to crash
Checking for one more crashing scenario