Null pointer verification added.