Added some null checks


2 files changed