Index: /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c
===================================================================
--- /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c	(revision 17384)
+++ /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c	(revision 17385)
@@ -16,4 +16,5 @@
     // convert the cached cached psf model for this source to a psKernel
     psKernel *psf = psphotKernelFromPSF (source, psfSize);
+    if (!psf) return NULL;
 
 # if (USE_DELTA_PSF)
@@ -28,5 +29,8 @@
     // use the source moments, etc to guess basic model parameters
     pmModel *modelConv = pmSourceModelGuess (source, modelType);
-    PS_ASSERT (modelConv, NULL);
+    if (!modelConv) {
+	psFree (psf);
+	return NULL;
+    }
 
     // XXX test : modify the Io, SXX, SYY terms based on the psf SXX, SYY terms:
