diff -r be9bbc350884 -r 42784fd84b16 Hardware/Mainboard/Mainboard.cs
--- a/Hardware/Mainboard/Mainboard.cs	Sun Mar 07 12:17:21 2010 +0000
+++ b/Hardware/Mainboard/Mainboard.cs	Mon Mar 08 19:42:42 2010 +0000
@@ -51,16 +51,22 @@
 
     public Mainboard() {
       this.smbios = new SMBIOS();
-      if (smbios.Board != null && smbios.Board.ProductName != null
-        && smbios.Board.ProductName != "") {
-        if (smbios.Board.Manufacturer == Manufacturer.Unkown)
-          this.name = smbios.Board.ProductName;
-        else
-          this.name = smbios.Board.Manufacturer + " " + 
-            smbios.Board.ProductName;
+     
+      if (smbios.Board != null) {
+        if (smbios.Board.ProductName != null
+          && smbios.Board.ProductName != "") {
+          if (smbios.Board.Manufacturer == Manufacturer.Unkown)
+            this.name = smbios.Board.ProductName;
+          else
+            this.name = smbios.Board.Manufacturer + " " +
+              smbios.Board.ProductName;
+        } else {
+          this.name = smbios.Board.Manufacturer.ToString();
+        }
       } else {
-        this.name = smbios.Board.Manufacturer.ToString();
+        this.name = Manufacturer.Unkown.ToString();
       }
+
       this.icon = Utilities.EmbeddedResources.GetImage("mainboard.png");
       this.lpcGroup = new LPCGroup();
     }