Index: trunk/ippToPsps/jython/datastore.py
===================================================================
--- trunk/ippToPsps/jython/datastore.py	(revision 32138)
+++ trunk/ippToPsps/jython/datastore.py	(revision 32139)
@@ -5,4 +5,5 @@
 import logging
 import sys
+import re
 from xml.etree.ElementTree import ElementTree, Element, tostring
 
@@ -63,4 +64,6 @@
     '''
     Removes an item from the datastore
+
+    NB this will return a success if the batch is not found on the datastore
     '''
     def remove(self, name):
@@ -71,13 +74,18 @@
                    --product " + self.product
 
-        p = Popen(command, shell=True, stdout=PIPE)
+        p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
         p.wait()
+        output, errors = p.communicate()
 
         if p.returncode != 0:
-            self.logger.errorPair("Datastore removal failed",  name)
-            ret = False
+            if re.search("not found in", errors):
+                self.logger.debugPair("Datastore batch not found", name)
+                ret = True
+            else:
+                self.logger.debugPair("Datastore removal FAILED", name)
+                ret = False
         else:
+            self.logger.debugPair("Datastore removal successful", name)
             ret = True
-            self.logger.infoPair("Datastore removal successful", name)
             
         return ret