Handle potential Nulls from getUnit()