Null guards and force closure bug fixes

Bug fixing and crashes associated with more NPEs.
Null guards.