Index: trunk/psModules/src/config/pmConfigRecipes.c
===================================================================
--- trunk/psModules/src/config/pmConfigRecipes.c	(revision 23626)
+++ trunk/psModules/src/config/pmConfigRecipes.c	(revision 23688)
@@ -81,5 +81,5 @@
             psTrace ("psModules.config", 3, "read recipes from camera config");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by camera config");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by camera config");
         }
     }
@@ -97,5 +97,5 @@
             psTrace ("psModules.config", 3, "read recipes from symbolic references");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
         }
 
@@ -105,5 +105,5 @@
             return false;
         }
-        psLogMsg ("psModules.config", PS_LOG_DETAIL, "merged camera recipes with system recipes");
+        psTrace ("psModules.config", PS_LOG_DETAIL, "merged camera recipes with system recipes");
 
         // load recipe-files specified on the command line
@@ -115,5 +115,5 @@
             psTrace ("psModules.config", 3, "read recipes from command-line arguments");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
         }
 
@@ -126,5 +126,5 @@
             psTrace ("psModules.config", 3, "read recipes from symbolic references");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
         }
 
@@ -137,5 +137,5 @@
             psTrace ("psModules.config", 3, "read recipes from command-line arguments");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
         }
     }
@@ -348,5 +348,5 @@
             psFree(recipesIter);
             return false;
-	}
+        }
     }
     psFree(recipesIter);
Index: trunk/psModules/src/config/pmErrorCodes.dat
===================================================================
--- trunk/psModules/src/config/pmErrorCodes.dat	(revision 23626)
+++ trunk/psModules/src/config/pmErrorCodes.dat	(revision 23688)
@@ -11,4 +11,5 @@
 OBJECTS			Problem in objects
 SKY			Problem in sky
+STAMPS			Unable to select stamps for PSF-matching
 # these errors correspond to standard exit conditions
 ARGUMENTS               Incorrect arguments
Index: trunk/psModules/src/imcombine/pmSubtractionMatch.c
===================================================================
--- trunk/psModules/src/imcombine/pmSubtractionMatch.c	(revision 23626)
+++ trunk/psModules/src/imcombine/pmSubtractionMatch.c	(revision 23688)
@@ -18,6 +18,8 @@
 #include "pmSubtractionMask.h"
 #include "pmSubtractionThreads.h"
+#include "pmSubtractionVisual.h"
+#include "pmErrorCodes.h"
+
 #include "pmSubtractionMatch.h"
-#include "pmSubtractionVisual.h"
 
 #define BG_STAT PS_STAT_ROBUST_MEDIAN   // Statistic to use for background
@@ -73,5 +75,5 @@
                                       stampSpacing, mode);
     if (!*stamps) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find stamps.");
+        psError(psErrorCodeLast(), false, "Unable to find stamps.");
         return false;
     }
Index: trunk/psModules/src/imcombine/pmSubtractionStamps.c
===================================================================
--- trunk/psModules/src/imcombine/pmSubtractionStamps.c	(revision 23626)
+++ trunk/psModules/src/imcombine/pmSubtractionStamps.c	(revision 23688)
@@ -20,5 +20,5 @@
 #include "pmModel.h"
 #include "pmSource.h"
-
+#include "pmErrorCodes.h"
 
 #include "pmSubtraction.h"
@@ -355,4 +355,5 @@
     if (numGood == 0 && numFound == 0) {
         // No good stamps
+        psError(PM_ERR_STAMPS, true, "Unable to find suitable stamps");
         psFree(stamps);
         return NULL;