diff --git a/Hardware/Mainboard/Mainboard.cs b/Hardware/Mainboard/Mainboard.cs
index 0a00651..4e13379 100644
--- a/Hardware/Mainboard/Mainboard.cs
+++ b/Hardware/Mainboard/Mainboard.cs
@@ -51,16 +51,22 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
 
     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();
     }
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index c87bf2e..114652b 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.25.0")]
-[assembly: AssemblyFileVersion("0.1.25.0")]
+[assembly: AssemblyVersion("0.1.26.0")]
+[assembly: AssemblyFileVersion("0.1.26.0")]