KFSTP-1579: add null checks to values from KC which we expect to be null
Merge pull request #72 from smith750/KFSTP-1579

KFSTP-1579