Fix for null comparison