diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a940b368c..a7d73538e 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -41,6 +41,11 @@ std::string cmSystemTools::CleanUpName(const char* name)
     }
   
   pos = className.find(' ');
+  if(pos != std::string::npos)
+    {
+    className = className.substr(0, pos);
+    }
+  pos = className.find('\t');
   if(pos != std::string::npos)
     {
     className = className.substr(0, pos);