diff --git a/xtrn/doorscan/doorscan.js b/xtrn/doorscan/doorscan.js
index 525332f9762bae03754eb38c2feffe8e897b9da0..d72452fc81ee762481899e322cf1502a19f071fa 100644
--- a/xtrn/doorscan/doorscan.js
+++ b/xtrn/doorscan/doorscan.js
@@ -1203,30 +1203,20 @@ function doScan()
 	ucfg.save();
 }
 
-
-if (argv[0] && argv[0].length) {
-	switch(argv[0].toLowerCase()) {
+for(i in argv) {
+	switch(argv[i].toLowerCase()) {
 		case 'scan':
 			doScan();
 			break;
 		case 'pre':
-			if(argv[1])
-				runPre(argv[1].toLowerCase());
-			else
-				throw("XTRN code not included on command-line!");
+			runPre(argv[i+1].toLowerCase());
 			break;
 		case 'post':
-			if(argv[1])
-				runPost(argv[1].toLowerCase());
-			else
-				throw("XTRN code not included on command-line!");
+			runPost(argv[i+1].toLowerCase());
 			break;			
 		case 'run':
 			// deprecated
-			if(argv[1])
-				runXtrn(argv[1].toLowerCase());
-			else
-				throw("XTRN code not included on command-line!");
+			runXtrn(argv[i+1].toLowerCase());
 			break;
 		case 'config':
 			new UserConfig(user.number).configure();
@@ -1237,7 +1227,7 @@ if (argv[0] && argv[0].length) {
 		case 'rank':
 			// TODO: Door popularity rankings
 			break;
-                default:
-                        break;
+        default:
+        	break;
 	}
 }