Index: trunk/psModules/src/camera/pmFPAConstruct.c
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.c	(revision 7168)
+++ trunk/psModules/src/camera/pmFPAConstruct.c	(revision 7278)
@@ -21,4 +21,7 @@
                               )
 {
+    assert(format);
+    assert(cellName && strlen(cellName) > 0);
+
     bool status = true;                 // Result of MD lookup
     psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS
@@ -43,4 +46,9 @@
                         )
 {
+    assert(first);
+    assert(second);
+    assert(third);
+    assert(string && strlen(string) > 0);
+
     bool allOK = true;                  // Everything was OK?
     psList *values = psStringSplit(string, " ,;", true); // List of the parts
@@ -96,4 +104,8 @@
                                  )
 {
+    assert(name && strlen(name) > 0);
+    assert(fileInfo);
+    assert(header);
+
     bool mdok = true;                   // Result of MD lookup
     psString keyword = psMetadataLookupStr(&mdok, fileInfo, name);
@@ -188,4 +200,8 @@
                              )
 {
+    assert(fileInfo);
+    assert(contents);
+    assert(header);
+
     bool mdok = true;                   // Status of MD lookup
     const char *contentHeaders = psMetadataLookupStr(&mdok, fileInfo, "CONTENT"); // Headers for content
@@ -237,4 +253,5 @@
     assert(contents && strlen(contents) > 0);
     assert(!cell || (cell && chip));    // Need both chip and cell if given a cell
+    assert(format);
 
     if (hdu && level == PM_FPA_LEVEL_FPA) {
@@ -329,4 +346,6 @@
                           )
 {
+    assert(format);
+
     bool mdok = true;                   // Status of MD lookup
     psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information
@@ -363,4 +382,6 @@
                      )
 {
+    PS_ASSERT_PTR_NON_NULL(camera, NULL);
+
     pmFPA *fpa = pmFPAAlloc(camera);    // The FPA to fill out
 
@@ -400,7 +421,7 @@
                            )
 {
-    assert(fpa);
-    assert(phuView);
-    assert(format);
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(phuView, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
 
     // Where does the PHU go?
@@ -495,7 +516,7 @@
                                    )
 {
-    assert(fpa);
-    assert(phu);
-    assert(format);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+    PS_ASSERT_PTR_NON_NULL(phu, NULL);
+    PS_ASSERT_PTR_NON_NULL(format, NULL);
 
     bool mdok = true;                   // Status from metadata lookups
@@ -689,4 +710,6 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa,);
+
     psTrace(__func__, 1, "FPA:\n");
     if (fpa->hdu) {