handling nulls in unchained better