Fix up more error catching