adds measures to prevent repo scaffolder from breaking on nil