Index: trunk/psModules/src/imcombine/pmSubtraction.c
===================================================================
--- trunk/psModules/src/imcombine/pmSubtraction.c	(revision 15417)
+++ trunk/psModules/src/imcombine/pmSubtraction.c	(revision 15422)
@@ -4,6 +4,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-26 03:21:13 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-31 21:09:33 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -930,4 +930,11 @@
 
             deviations->data.F32[i] = devNorm * deviation;
+            if (!isfinite(deviations->data.F32[i])) {
+                stamp->status = PM_SUBTRACTION_STAMP_REJECTED;
+                psTrace("psModules.imcombine", 5,
+                        "Rejecting stamp %d (%d,%d) because of non-finite deviation\n",
+                        i, (int)(stamp->x + 0.5), (int)(stamp->y + 0.5));
+                continue;
+            }
             psTrace("psModules.imcombine", 5, "Deviation for stamp %d (%d,%d): %f\n",
                     i, (int)(stamp->x + 0.5), (int)(stamp->y + 0.5), deviations->data.F32[i]);
@@ -948,4 +955,10 @@
 
         }
+    }
+
+    if (numStamps == 0) {
+        psError(PS_ERR_UNKNOWN, true, "No good stamps found.");
+        psFree(deviations);
+        return -1;
     }