Index: branches/eam_branches/ipp-20101205/psphot/src/psphotChoosePSF.c
===================================================================
--- branches/eam_branches/ipp-20101205/psphot/src/psphotChoosePSF.c	(revision 30107)
+++ branches/eam_branches/ipp-20101205/psphot/src/psphotChoosePSF.c	(revision 30108)
@@ -249,5 +249,7 @@
         if (!try) {
             // No big deal --- we'll try another model
-            psErrorClear();
+            if (i < modelNames->n - 1) {
+                psErrorClear();
+            }
             continue;
         }
Index: branches/eam_branches/ipp-20101205/psphot/src/psphotGuessModels.c
===================================================================
--- branches/eam_branches/ipp-20101205/psphot/src/psphotGuessModels.c	(revision 30107)
+++ branches/eam_branches/ipp-20101205/psphot/src/psphotGuessModels.c	(revision 30108)
@@ -206,5 +206,5 @@
             float Xc = 0.5*readout->image->numCols;
             float Yc = 0.5*readout->image->numRows;
-            pmModel *modelPSF = pmModelFromPSFforXY(psf, Xc, Yc, Io);
+            modelPSF = pmModelFromPSFforXY(psf, Xc, Yc, Io);
             if (modelPSF == NULL) {
                 psError(PSPHOT_ERR_PSF, false, "Failed to determine PSF model at center of image");