Added null to non null comparison