diff -uNr a/src/fwbuilder/FWObjectDatabase.cpp b/src/fwbuilder/FWObjectDatabase.cpp
--- a/src/fwbuilder/FWObjectDatabase.cpp	2009-09-18 21:28:02.000000000 +0200
+++ b/src/fwbuilder/FWObjectDatabase.cpp	2010-01-23 20:35:40.000000000 +0100
@@ -254,7 +254,7 @@
                                       FWObjectDatabase::TYPENAME)!=SAME)
     {
 	xmlFreeDoc(doc);
-        xmlCleanupParser();
+        /* xmlCleanupParser(); */
         throw FWException("Data file has invalid structure: "+f);
     }
     
@@ -299,7 +299,7 @@
                        FWObjectDatabase::DTD_FILE_NAME);
 
     xmlFreeDoc(doc);
-    xmlCleanupParser();
+    /* xmlCleanupParser(); */
 
     setDirty(false);
     init = false;
@@ -328,7 +328,7 @@
                            FWObjectDatabase::TYPENAME,
                            FWObjectDatabase::DTD_FILE_NAME);
     xmlFreeDoc(doc);  
-    xmlCleanupParser();
+    /* xmlCleanupParser(); */
 //    setDirty(false);
 
     init = false;
diff -uNr a/src/fwbuilder/XMLTools.cpp b/src/fwbuilder/XMLTools.cpp
--- a/src/fwbuilder/XMLTools.cpp	2009-09-18 21:28:02.000000000 +0200
+++ b/src/fwbuilder/XMLTools.cpp	2010-01-23 20:35:40.000000000 +0100
@@ -353,7 +353,7 @@
         if(!(*upgrade)(upgrade_msg))
         {
             xmlFreeDoc(newdoc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException("Load operation cancelled for file: '"+data_file);
         }
      
@@ -370,7 +370,7 @@
         if(rename(data_file.c_str(), backup_file.c_str()))
         {
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException("Error making backup copy of file: '" + 
                               data_file + "' as '" + backup_file + "'");
         }
@@ -394,7 +394,7 @@
     } 
     assert(doc!=NULL);
     xmlFreeDoc(doc);
-    xmlCleanupParser();
+    /* xmlCleanupParser(); */
 
     // Now we know the version is OK,
     // let us load for real, checking DTD.
@@ -568,7 +568,7 @@
     xmlFreeDoc(doc);
 
     xsltCleanupGlobals();
-    xmlCleanupParser();
+    /* xmlCleanupParser(); */
 }
 
 void XMLTools::transformDocumentToFile(xmlDocPtr doc, 
@@ -646,7 +646,7 @@
         xsltSaveResultToFilename(dst_file.c_str(), res, ss, 0 /* compression */ );
 
     xmlFreeDoc(res);
-    xmlCleanupParser();
+    /* xmlCleanupParser(); */
     xsltFreeStylesheet(ss);
 }
 
@@ -723,7 +723,7 @@
     if (!root || !root->name || type_name!=FROMXMLCAST(root->name))
     {
         xmlFreeDoc(doc);
-        xmlCleanupParser();
+        /* xmlCleanupParser(); */
         throw FWException("XML file '"+file_name+ "' has invalid structure.");
     }
 
@@ -780,7 +780,7 @@
         if (access(fname.c_str() , R_OK )!=0) 
         {
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException(
                 string("File '" + file_name +
                        "' conversion error: no converter found for version: ") +
@@ -794,18 +794,18 @@
         {
             ex.getProperties()["failed_transformation"]=fname;
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw;
         }
         xmlFreeDoc(doc);
-        xmlCleanupParser();
+        /* xmlCleanupParser(); */
         doc = res;
         
         root = xmlDocGetRootElement(doc);
         if (!root || !root->name || type_name!=FROMXMLCAST(root->name))
         {
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException("File '" + file_name +
                               "' conversion Error: conversion produced file with invalid structure.");
         }
@@ -814,7 +814,7 @@
         if (v==NULL)
         {
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException("File '" + file_name +
                               "' conversion error: converted to unknown version.");
         } 
@@ -825,7 +825,7 @@
         if (version_compare(vers, oldversion) <= 0)
         {
             xmlFreeDoc(doc);
-            xmlCleanupParser();
+            /* xmlCleanupParser(); */
             throw FWException("File '" + file_name +
                               "' conversion error: conversion did not advance version number!.");
         }