Removed null pointer dereference