Fix nil object reference when no baseline exists