KFSCNTRB-784 code changes to fix potential NPE in scrubber job.
Merge pull request #2 from ua-eas/KFSCNTRB-784_2

KFSCNTRB-784 code changes to fix potential NPE in scrubber job.