Index: trunk/ippTools/src/pxadminConfig.c
===================================================================
--- trunk/ippTools/src/pxadminConfig.c	(revision 10063)
+++ trunk/ippTools/src/pxadminConfig.c	(revision 10074)
@@ -34,4 +34,5 @@
 
     config->modules = pmConfigRead(&argc, argv);
+
 
     if (! config->modules) {
@@ -97,4 +98,6 @@
     }
 
+   psFree(arguments);
+
     // define Database handle, if used
     config->dbh = pmConfigDB(config->modules);
@@ -103,6 +106,4 @@
         exit(EXIT_FAILURE);
     }
-
-    config->args = arguments;
 
     return config;
Index: trunk/ippTools/src/pxtables.c
===================================================================
--- trunk/ippTools/src/pxtables.c	(revision 10063)
+++ trunk/ippTools/src/pxtables.c	(revision 10074)
@@ -40,6 +40,4 @@
 
 bool pxCreateTables(pxConfig *config) {
-    bool            status = true;
-
     PS_ASSERT_PTR_NON_NULL(config, false);
 
@@ -52,4 +50,6 @@
     }
 #endif
+
+    bool            status = true;
     CREATE_TABLE(summitExpCreateTable);
     CREATE_TABLE(summitImfileCreateTable);
@@ -102,5 +102,8 @@
     fgets (line, 128, stdin);
     sscanf (line, "%s", answer);
-    if (strcmp (answer, "YES")) goto escape;
+    if (strcmp (answer, "YES"))  {
+        psError(PS_ERR_UNKNOWN, true, "tables NOT deleleted");
+        return false;
+    }
 
     fprintf (stdout, "enter dbh connection password: ");
@@ -111,6 +114,8 @@
         bool status;
         psString dbPassword = psMetadataLookupStr(&status, config->modules->site, "DBPASSWORD");
-        if (strcmp (answer, dbPassword)) goto escape;
-        psFree(dbPassword);
+        if (strcmp (answer, dbPassword)) {
+            psError(PS_ERR_UNKNOWN, true, "tables NOT deleleted");
+            return false;
+        }
     }
 
@@ -151,10 +156,3 @@
 
     return status;
-
-escape:
-    // XXX fix psMetadataLookupStr() to inc ref count
-    // psFree(dbPassword);
-    fprintf (stdout, "tables NOT deleted\n");
-
-    return false;
 }