Fix a potential SEGFAULT in the new A/B code...