Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 8052)
+++ trunk/ippTools/src/chiptool.c	(revision 8059)
@@ -51,4 +51,6 @@
 static bool quickMode(pxConfig *config)
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
     psArray *rawFrames = rawScienceFrameSearch(config);
     if (!rawFrames) {
@@ -67,4 +69,6 @@
 static bool defineMode(pxConfig *config)
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
     psArray *rawFrames = rawScienceFrameSearch(config);
     if (!rawFrames) {
@@ -133,4 +137,6 @@
 static bool pendingMode(pxConfig *config)
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
     psArray *pendingFrames = p2PendingFrameSearch(config);
     if (!pendingFrames) {
@@ -157,4 +163,17 @@
 static bool doneMode(pxConfig *config)
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    // -uri is always required
+    bool status = false;
+    psString uri = psMetadataLookupStr(&status, config->args, "-uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
+        return NULL;
+    }
+    if (!uri) {
+        psError(PS_ERR_UNKNOWN, true, "-uri is required");
+        return NULL;
+    }
     // get exp_id/class/class_id/uri from the CLI
     // add the completed imfile to