--- trunk/src/io/Globals.cpp	2005/12/02 15:38:03	770
+++ trunk/src/io/Globals.cpp	2006/01/11 19:01:20	845
@@ -45,10 +45,10 @@
 #include <string>
 
 #include "io/Globals.hpp"
+#include "io/ParamConstraint.hpp"
+#include "utils/MemoryUtils.hpp"
 #include "utils/simError.h"
 
-#include "io/ParamConstraint.hpp"
-
 namespace oopse {
 Globals::Globals() {
   DefineParameter(ForceField, "forceField")
@@ -121,8 +121,8 @@ Globals::~Globals() {
 }
 
 Globals::~Globals() {
-
-
+    MemoryUtils::deletePointers(components_);
+    MemoryUtils::deletePointers(zconstraints_);
 }
 
 void Globals::validate() {
@@ -181,7 +181,9 @@ void Globals::validate() {
 
   for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
     if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
-        std::cout << "Globals Error: can not find molecule stamp for component" << std::endl;
+        std::ostringstream oss;
+        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
+        throw OOPSEException(oss.str());           
     }
   }
 }
@@ -205,7 +207,9 @@ bool Globals::addMoleculeStamp(MoleculeStamp* molStamp
         moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
         ret = true;
     } else {
-
+        std::ostringstream oss;
+        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
+        throw OOPSEException(oss.str());  
     }
     return ret;
 }