Added a new null pointer verification