PRD-5124 - Safer fix, prevents NPEs during crosstab preprocessing.
Merge pull request #419 from tmorgner/PRD-5124

PRD-5124 - Safer fix, prevents NPEs during crosstab preprocessing.