Null Reference Fixes

Various Null References fixed.