diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index caaa03cbb9772096732bca53eeea7bbbeb96e9f6..b0434f49a79f17692bf1f07e7d13ee60a74b7e02 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1824,6 +1824,7 @@ const char * SystemInformationImplementation::GetVendorID()
       return "Motorola";
     case HP:
       return "Hewlett-Packard";
+    case UnknownManufacturer:
     default:
       return "Unknown Manufacturer";
     }
@@ -3065,6 +3066,12 @@ bool SystemInformationImplementation::RetrieveClassicalCPUIdentity()
     case NSC:
       this->ChipID.ProcessorName = "Cx486SLC \\ DLC \\ Cx486S A-Step";
       break;
+
+    case Sun:
+    case IBM:
+    case Motorola:
+    case HP:
+    case UnknownManufacturer:
     default:
       this->ChipID.ProcessorName = "Unknown family"; // We cannot identify the processor.
       return false;