Fix up potential NPE in failure arm