Fix (paper over) NPE on Rob's machine.