Fixed or_ check for null