Index: trunk/psphot/src/Makefile.am
===================================================================
--- trunk/psphot/src/Makefile.am	(revision 37965)
+++ trunk/psphot/src/Makefile.am	(revision 38039)
@@ -1,23 +1,8 @@
 lib_LTLIBRARIES = libpsphot.la
-
-if HAVE_SVNVERSION
-PSPHOT_VERSION=`$(SVNVERSION) ..`
-else
-PSPHOT_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSPHOT_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PSPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSPHOT_BRANCH="UNKNOWN"
-PSPHOT_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of psphotVersion.c, since it gets the version information
 psphotVersion.c: psphotVersionDefinitions.h
 psphotVersionDefinitions.h: psphotVersionDefinitions.h.in FORCE
-	-$(RM) psphotVersionDefinitions.h
-	$(SED) -e "s|@PSPHOT_VERSION@|\"$(PSPHOT_VERSION)\"|" -e "s|@PSPHOT_BRANCH@|\"$(PSPHOT_BRANCH)\"|" -e "s|@PSPHOT_SOURCE@|\"$(PSPHOT_SOURCE)\"|" psphotVersionDefinitions.h.in > psphotVersionDefinitions.h
+	pslib-setsvnversion.pl PSPHOT psphotVersionDefinitions.h.in psphotVersionDefinitions.h
 FORCE: ;
 
Index: trunk/psphot/src/psphotFitSourcesLinear.c
===================================================================
--- trunk/psphot/src/psphotFitSourcesLinear.c	(revision 37965)
+++ trunk/psphot/src/psphotFitSourcesLinear.c	(revision 38039)
@@ -688,5 +688,7 @@
     assert (modelVar);
 
-    psMetadataRemoveKey (readout->analysis, "PSPHOT.MODEL.VAR"); 
+    if (modelVar) {
+      psMetadataRemoveKey (readout->analysis, "PSPHOT.MODEL.VAR"); 
+    }
 
     // clear modelVar pointers for all of the source models
Index: trunk/psphot/src/psphotSubtractBackground.c
===================================================================
--- trunk/psphot/src/psphotSubtractBackground.c	(revision 37965)
+++ trunk/psphot/src/psphotSubtractBackground.c	(revision 38039)
@@ -29,5 +29,5 @@
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
     psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
-    assert (maskVal);
+    psAssert (maskVal, "MASK.PSPHOT missing from recipe");
 
     psImageBinning *binning = psMetadataLookupPtr(&status, model->analysis, "PSPHOT.BACKGROUND.BINNING");