Index: /trunk/psphot/src/psphotSourceFits.c
===================================================================
--- /trunk/psphot/src/psphotSourceFits.c	(revision 10202)
+++ /trunk/psphot/src/psphotSourceFits.c	(revision 10203)
@@ -80,5 +80,5 @@
         // if this one failed, skip it
         if (!psphotEvalPSF (blend, model)) {
-            psTrace ("psphot", 5, "failed on blend %d of %ld\n", i, modelSet->n);
+            psTrace ("psphot", 4, "failed on blend %d of %ld\n", i, modelSet->n);
             continue;
         }
@@ -92,13 +92,14 @@
         blend->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     }
+    // evaluate the primary object
+    if (!psphotEvalPSF (source, PSF)) {
+        psTrace ("psphot", 4, "failed on blend 0 of %ld\n", modelSet->n);
+        psFree (PSF);
+	psFree (modelSet);
+	psFree (sourceSet);
+        return false;
+    }
     psFree (modelSet);
     psFree (sourceSet);
-
-    // evaluate the primary object
-    if (!psphotEvalPSF (source, PSF)) {
-        psTrace ("psphot", 5, "failed on blend 0 of %ld\n", modelSet->n);
-        psFree (PSF);
-        return false;
-    }
 
     psTrace ("psphot", 5, "fitted primary as PSF\n");
@@ -210,5 +211,5 @@
 
     // save chisq for double-star/galaxy comparison
-    chiDBL = ONE->chisqNorm;
+    chiDBL = ONE->chisq / ONE->nDOF;
 
     // correct second model chisqs for flux trend
