Working on null-checked tracking.