Index: trunk/ippToPsps/jython/batch.py
===================================================================
--- trunk/ippToPsps/jython/batch.py	(revision 33672)
+++ trunk/ippToPsps/jython/batch.py	(revision 33787)
@@ -39,5 +39,4 @@
                  useFullTables): 
 
-        self.everythingOK = False
         self.readHeader = False
         self.config = config
@@ -66,5 +65,5 @@
             if not self.header: 
                 logger.errorPair("Could not read FITS for id", "%d" % id)
-                return
+                raise
 
         self.scratchDb.setUseFullTables(self.useFullTables)
@@ -115,5 +114,4 @@
         self.logger.infoPair("Output path", self.localOutPath)
 
-        self.everythingOK = True
     
     '''
@@ -510,28 +508,23 @@
     def run(self):
 
-        if not self.everythingOK:
-            self.logger.errorPair("Aborting this batch", "could not initialize")
-            self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
-
         if not self.createEmptyPspsTables():
             self.logger.errorPair("Aborting this batch", "could not create empty PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
+            raise
 
         if not self.importIppTables():
             self.logger.errorPair("Aborting this batch", "could not import IPP tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
+            raise
 
         if not self.populatePspsTables():
             self.logger.errorPair("Aborting this batch", "unable to populate PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return 
+            raise 
 
         if not self.exportPspsTablesToFits():
             self.logger.errorPair("Aborting this batch", "unable to export tables to FITS file")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return 
+            raise 
    
         if self.writeBatchManifest():