diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index 583cb9d88..1e872a546 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -58,7 +58,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--new=amstradcpc"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/ColecoVision/Galaxian (1983)(Atari).col&quot;"
@@ -74,11 +74,11 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Amstrad CPC/Amstrad CPC [TOSEC]/Amstrad CPC - Applications - [DSK] (TOSEC-v2011-08-31_CM)/Tasword (1984)(Tasman Software).dsk&quot;"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Amstrad CPC/Robocop.dsk&quot;"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--speed=5"
diff --git a/OSBindings/SDL/main.cpp b/OSBindings/SDL/main.cpp
index 845569c15..07692ed41 100644
--- a/OSBindings/SDL/main.cpp
+++ b/OSBindings/SDL/main.cpp
@@ -585,14 +585,6 @@ int main(int argc, char *argv[]) {
 
 	// Determine the machine for the supplied file, if any, or from --new.
 	Analyser::Static::TargetList targets;
-	if(!arguments.file_names.empty()) {
-		// Take the first file name that actually implies a machine.
-		auto file_name = arguments.file_names.begin();
-		while(file_name != arguments.file_names.end() && targets.empty()) {
-			targets = Analyser::Static::GetTargets(*file_name);
-			++file_name;
-		}
-	}
 
 	const auto new_argument = arguments.selections.find("new");
 	std::string long_machine_name;
@@ -618,6 +610,13 @@ int main(int argc, char *argv[]) {
 			std::unique_ptr<Analyser::Static::Target> tgt = std::move(targets_by_machine[long_machine_name]);
 			targets.push_back(std::move(tgt));
 		}
+	} else if(!arguments.file_names.empty()) {
+		// Take the first file name that actually implies a machine.
+		auto file_name = arguments.file_names.begin();
+		while(file_name != arguments.file_names.end() && targets.empty()) {
+			targets = Analyser::Static::GetTargets(*file_name);
+			++file_name;
+		}
 	}
 
 	if(targets.empty()) {
@@ -765,12 +764,17 @@ int main(int argc, char *argv[]) {
 	machine_runner.machine = machine.get();
 	machine_runner.machine_mutex = &machine_mutex;
 
-	// Ensure all media is inserted.
-	Analyser::Static::Media media;
-	for(const auto &file_name: arguments.file_names) {
-		media += Analyser::Static::GetMedia(file_name);
+	// Ensure all media is inserted, if this machine accepts it.
+	{
+		auto media_target = machine->media_target();
+		if(media_target) {
+			Analyser::Static::Media media;
+			for(const auto &file_name: arguments.file_names) {
+				media += Analyser::Static::GetMedia(file_name);
+			}
+			media_target->insert_media(media);
+		}
 	}
-	machine->media_target()->insert_media(media);
 
 	// Attempt to set up video and audio.
 	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) {