PRD-4506: Fixed hidden NPE caused by auto-unboxing an null-value
Merge pull request #109 from tmorgner/PRD-4506

PRD-4506: Fixed hidden NPE caused by auto-unboxing an null-value