--- log.cc	2011-03-27 19:17:11.050365001 +0800
+++ log.cc	2011-03-27 19:17:09.420618713 +0800
@@ -258,16 +258,27 @@ 
 LogComponentEnable (char const *name, enum LogLevel level)
 {
   ComponentList *components = GetComponentList ();
-  for (ComponentListI i = components->begin ();
+  ComponentListI i;
+  for ( i = components->begin ();
        i != components->end ();
        i++)
     {
       if (i->first.compare (name) == 0) 
 	{
 	  i->second->Enable (level);
-	  break;
+	  return;
 	}
-    }  
+    }
+
+    if(i == components->end()) {
+	// nothing matched 
+      std::cout<<"Logging component \""<<name<<"\" not found. "<<"Displaying list of available log components below. \n\n";
+      for (ComponentListI i = components->begin ();i != components->end ();i++)   {
+		std::cout<<i->first<<std::endl;  
+       }
+      std::cout<<"Logging component \""<<name<<"\" not found. Look above for a list of available log components available.\n";
+   NS_FATAL_ERROR ("Terminating because the logging component was not found");
+    }
 }
 
 void