Index: /trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- /trunk/ippTools/src/chiptoolConfig.c	(revision 6132)
+++ /trunk/ippTools/src/chiptoolConfig.c	(revision 6133)
@@ -4,4 +4,5 @@
 
 bool p2searchConfig (p2Config *config, int argc, char **argv) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     // Parse the configurations (re-org a la ppImage)
Index: /trunk/ippTools/src/p2insertDoneFrames.c
===================================================================
--- /trunk/ippTools/src/p2insertDoneFrames.c	(revision 6132)
+++ /trunk/ippTools/src/p2insertDoneFrames.c	(revision 6133)
@@ -4,4 +4,6 @@
 // select pending frames (exposure+images) which are done/not done
 bool p2insertDoneFrames(p2Config *config, psArray *doneFrames) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(doneFrames, false);
 
     for (int i = 0; i < doneFrames->n; i++) {
Index: /trunk/ippTools/src/p2insertPendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2insertPendingFrames.c	(revision 6132)
+++ /trunk/ippTools/src/p2insertPendingFrames.c	(revision 6133)
@@ -7,4 +7,6 @@
 //      this is useful since the table must be locked the whole time, to get the versions
 bool p2insertPendingFrames(p2Config *config, psArray *rawFrames) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(rawFrames, false);
 
     psMetadata *where = psMetadataAlloc();
Index: /trunk/ippTools/src/p2pendingToDone.c
===================================================================
--- /trunk/ippTools/src/p2pendingToDone.c	(revision 6132)
+++ /trunk/ippTools/src/p2pendingToDone.c	(revision 6133)
@@ -3,4 +3,6 @@
 // select pending frames (exposure+images) which are done/not done
 psArray *p2pendingToDone(p2Config *config, psArray *pendingFrames) {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(pendingFrames, NULL);
 
     psArray *doneFrames = psArrayAlloc(pendingFrames->n);
Index: /trunk/ippTools/src/p2rawToPending.c
===================================================================
--- /trunk/ippTools/src/p2rawToPending.c	(revision 6132)
+++ /trunk/ippTools/src/p2rawToPending.c	(revision 6133)
@@ -3,4 +3,6 @@
 // select pending frames (exposure+images) which are done/not done
 psArray *p2rawToPending(p2Config *config, psArray *rawFrames) {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(rawFrames, NULL);
 
     psArray *pendingFrames = psArrayAlloc(rawFrames->n);
Index: /trunk/ippTools/src/p2searchPendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2searchPendingFrames.c	(revision 6132)
+++ /trunk/ippTools/src/p2searchPendingFrames.c	(revision 6133)
@@ -3,4 +3,5 @@
 // select pending frames (exposure+images) which are done/not done
 psArray *p2searchPendingFrames(p2Config *config) {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
 
     // build 'where' structure
Index: /trunk/ippTools/src/p2searchRawFrames.c
===================================================================
--- /trunk/ippTools/src/p2searchRawFrames.c	(revision 6132)
+++ /trunk/ippTools/src/p2searchRawFrames.c	(revision 6133)
@@ -3,4 +3,5 @@
 // select raw frames (exposure+images) which match the given config options
 psArray *p2searchRawFrames(p2Config *config) {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
 
     // build 'where' structure
Index: /trunk/ippTools/src/p2updatePending.c
===================================================================
--- /trunk/ippTools/src/p2updatePending.c	(revision 6132)
+++ /trunk/ippTools/src/p2updatePending.c	(revision 6133)
@@ -2,5 +2,7 @@
 
 // select pending frames (exposure+images) which are not done, select their done images, count, update
-bool p2updatePendingFrames (p2Config *config, psArray *pendingFrames) {
+bool p2updatePendingFrames(p2Config *config, psArray *pendingFrames) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(pendingFrames, false);
 
     psMetadata *where = psMetadataAlloc ();
Index: /trunk/ippTools/src/p2writePendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2writePendingFrames.c	(revision 6132)
+++ /trunk/ippTools/src/p2writePendingFrames.c	(revision 6133)
@@ -3,4 +3,6 @@
 // select pending frames (exposure+images) which are done/not done
 bool p2writePendingFrames (p2Config *config, psArray *frames) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(frames, false);
 
     fprintf (stdout, "# exp_id class class_id url\n");
@@ -8,4 +10,7 @@
     for (int i = 0; i < frames->n; i++) {
         p2PendingFrame *frame = frames->data[i];
+        PS_ASSERT_PTR_NON_NULL(frame, false);
+        PS_ASSERT_PTR_NON_NULL(frame->images, false);
+
         for (int j = 0; j < frame->images->n; j++) {
             p2PendingImfileRow *image = frame->images->data[j];
Index: /trunk/ippTools/src/pxadminConfig.c
===================================================================
--- /trunk/ippTools/src/pxadminConfig.c	(revision 6132)
+++ /trunk/ippTools/src/pxadminConfig.c	(revision 6133)
@@ -2,5 +2,6 @@
 # include "p2tools.h"
 
-bool p2adminConfig (p2Config *config, int argc, char **argv) {
+bool p2adminConfig(p2Config *config, int argc, char **argv) {
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     // Parse the configurations (re-org a la ppImage)