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