Baseline: don't NPE when type is removed