diff -r 912a06e2bd53 -r b68a6f3b82a3 Hardware/CPU/CPUID.cs
--- a/Hardware/CPU/CPUID.cs	Fri May 21 17:28:52 2010 +0000
+++ b/Hardware/CPU/CPUID.cs	Sat May 22 12:12:50 2010 +0000
@@ -51,16 +51,13 @@
 
     private int thread;
 
-    private uint maxCpuid = 0;
-    private uint maxCpuidExt = 0;
+    private Vendor vendor = Vendor.Unknown;
 
-    private Vendor vendor;
+    private string cpuBrandString = "";
+    private string name = "";
 
-    private string cpuBrandString;
-    private string name;
-
-    private uint[,] cpuidData;
-    private uint[,] cpuidExtData;
+    private uint[,] cpuidData = new uint[0, 0];
+    private uint[,] cpuidExtData = new uint[0, 0];
 
     private uint family;
     private uint model;
@@ -102,6 +99,9 @@
     public CPUID(int thread) {
       this.thread = thread;
 
+      uint maxCpuid = 0;
+      uint maxCpuidExt = 0;
+
       uint eax, ebx, ecx, edx;
 
       if (thread >= 32)
@@ -138,6 +138,8 @@
             maxCpuidExt = eax - CPUID_EXT;
           else
             return;
+        } else {
+          throw new ArgumentException();
         }
       } else {
         throw new ArgumentException();
@@ -236,14 +238,6 @@
       get { return thread; }
     }
 
-    public uint MaxCPUID {
-      get { return maxCpuid; }
-    }
-
-    public uint MaxCpuidExt {
-      get { return maxCpuidExt; }
-    }
-
     public Vendor Vendor {
       get { return vendor; }
     }