Null pointer removed