diff --git a/src/config.c b/src/config.c
index da58b02e8..9aead9a0f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -531,7 +531,18 @@ load_machine(void)
 	machine = machine_count() - 1;
 
     cpu_manufacturer = config_get_int(cat, "cpu_manufacturer", 0);
+    if ((cpu_manufacturer >= (sizeof(machines[machine].cpu) / sizeof(machines[machine].cpu[0]))) ||
+	(machines[machine].cpu[cpu_manufacturer].cpus == NULL))
+	cpu_manufacturer = 0;
+
     cpu = config_get_int(cat, "cpu", 0);
+    for (int i = 0; i != cpu; i++) {
+	if (machines[machine].cpu[cpu_manufacturer].cpus[i].cpu_type == -1) {
+		cpu = 0;
+		break;
+	}
+    }
+
     cpu_waitstates = config_get_int(cat, "cpu_waitstates", 0);
 
     p = (char *)config_get_string(cat, "fpu_type", "none");
@@ -543,7 +554,7 @@ load_machine(void)
     if (mem_size < (((machines[machine].flags & MACHINE_AT) &&
         (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram))
 	mem_size = (((machines[machine].flags & MACHINE_AT) && (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram);
-#endif    
+#endif
 	
     if (mem_size > 2097152)
 	mem_size = 2097152;