Index: trunk/psModules/src/objects/pmModelUtils.c
===================================================================
--- trunk/psModules/src/objects/pmModelUtils.c	(revision 14938)
+++ trunk/psModules/src/objects/pmModelUtils.c	(revision 15562)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:04:30 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-10 01:09:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -36,4 +36,7 @@
 pmModel *pmModelFromPSF (pmModel *modelEXT, pmPSF *psf)
 {
+    PS_ASSERT_PTR_NON_NULL(psf, NULL);
+    PS_ASSERT_PTR_NON_NULL(modelEXT, NULL);
+
     // allocate a new pmModel to hold the PSF version
     pmModel *modelPSF = pmModelAlloc (psf->type);
@@ -53,7 +56,7 @@
 // instantiate a model for the PSF at this location with peak flux
 // NOTE: psf and (Xo,Yo) are defined wrt chip coordinates
-pmModel *pmModelFromPSFforXY (pmPSF *psf, float Xo, float Yo, float Io) {
-
-    assert (psf);
+pmModel *pmModelFromPSFforXY (pmPSF *psf, float Xo, float Yo, float Io)
+{
+    PS_ASSERT_PTR_NON_NULL(psf, NULL);
 
     // allocate a new pmModel to hold the PSF version
@@ -75,4 +78,6 @@
 // set this model to have the requested flux
 bool pmModelSetFlux (pmModel *model, float flux) {
+    PS_ASSERT_PTR_NON_NULL(model, NULL);
+    PS_ASSERT_PTR_NON_NULL(model->params, NULL);
 
     // set Io to be 1.0