PRD-4584 et al: Handling of null input must be more robust
Merge pull request #187 from tmorgner/master

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