Handle unit == nil, too?