diff --git a/devTools/scripts/detectChanges.js b/devTools/scripts/detectChanges.js
index 600bd1098fd9a341e023688d32fbab0b34f91400..1bb8324933038b4246fa21eaa5a22c28052b8ddc 100644
--- a/devTools/scripts/detectChanges.js
+++ b/devTools/scripts/detectChanges.js
@@ -128,13 +128,21 @@ class ChangeParser {
 	 * Fetches and updates pregmodfan/pregmod-master as upstream/pregmod-master
 	 */
 	fetchOrigin() {
-		let command = "git remote";
-		if (!(execSync(command).toString().includes("upstream"))) {
-			command = "git remote add upstream https://gitgud.io/pregmodfan/fc-pregmod.git/";
+		try {
+			let command = "git remote";
+			if (!(execSync(command).toString().includes("upstream"))) {
+				command = "git remote add upstream https://gitgud.io/pregmodfan/fc-pregmod.git/";
+				execSync(command);
+			}
+			command = "git fetch --quiet upstream pregmod-master";
 			execSync(command);
+		} catch (e) {
+			if (e.message.includes("Could not resolve host")) {
+				// fail silently
+			} else {
+				throw e;
+			}
 		}
-		command = "git fetch --quiet upstream pregmod-master";
-		execSync(command);
 	}
 
 	/**
diff --git a/devTools/scripts/sanityCheck.js b/devTools/scripts/sanityCheck.js
index 2b117ff3dcb6f4afca16ae367fa588b0ad26a506..a4d94353f3b4b7ca6ca0929b25ac61ab5f8bd3f0 100644
--- a/devTools/scripts/sanityCheck.js
+++ b/devTools/scripts/sanityCheck.js
@@ -88,7 +88,12 @@ if (args.staged === true) {
 	if (stagedFiles === null) {
 		stagedFiles = undefined;
 	}
-} else {
+} else if (
+	(settings.checksEnableCustom === true && settings.checksOnlyChangedCustom === true) ||
+	(settings.checksEnableESLint === true && settings.checksOnlyChangedESLint === true) ||
+	(settings.checksEnableSpelling === true && settings.checksOnlyChangedSpelling === true) ||
+    (settings.checksEnableTypescript === true && settings.checksOnlyChangedTypescript === true)
+) {
 	// @ts-ignore
 	await parser.init(args.interaction);
 }