SHDP-399 Fix potential NPE when running Pig tests
Merge pull request #159 from trisberg/SHDP-399-B

SHDP-399 Fix potential NPE when running Pig tests