Be more careful about errors during init