Added in the null pointer checker