use direct check for NULL instead, old fix was incorrect