Added non null to null comparison