Fix issue where null in database would cause unpack issue