Fixed NullChecks
Merge pull request #2 from Ethan07Scape/patch-3

Fixed NullChecks