Added boxed-type null handling