Index: branches/tap_branches/ippTools/src/pxmagic.c
===================================================================
--- branches/tap_branches/ippTools/src/pxmagic.c	(revision 25900)
+++ branches/tap_branches/ippTools/src/pxmagic.c	(revision 27838)
@@ -35,5 +35,5 @@
     psString query_temp = pxDataGet(queryFile);
     if (!query_temp) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", queryFile);
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement from %s", queryFile);
         psFree(queryFile);
         if (!psDBRollback(config->dbh)) {
@@ -75,9 +75,9 @@
     if (not_destreaked) {
         if (destreaked) {
-            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
+            psError(PXTOOLS_ERR_CONFIG, true, "providing -not_destreaked and -destreaked makes no sense");
             return false;
         }
         if (magicked) {
-            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
+            psError(PXTOOLS_ERR_CONFIG, true, "providing -not_destreaked and -magicked makes no sense");
             return false;
         }
@@ -87,4 +87,5 @@
         psStringAppend(out, " AND %s.magicked != 0", table);
     }
+    // Note -magicked is  handled by the caller. XXX: Why?
     return true;
 }