Issue #3506377: Added null checks.

Closes #3506377

Merge request reports

Loading