PRD-4584 et al: Handling of null input must be more robust