Removed null pointer