Index: trunk/psModules/src/camera/pmFPAUtils.c
===================================================================
--- trunk/psModules/src/camera/pmFPAUtils.c	(revision 7017)
+++ trunk/psModules/src/camera/pmFPAUtils.c	(revision 7278)
@@ -9,5 +9,11 @@
                  )
 {
-    psArray *chips = fpa->chips;    // Array of chips
+    PS_ASSERT_PTR_NON_NULL(fpa, -1);
+    PS_ASSERT_PTR_NON_NULL(name, -1);
+    if (strlen(name) == 0) {
+        return -1;
+    }
+
+    psArray *chips = fpa->chips;        // Array of chips
     for (int i = 0; i < chips->n; i++) {
         pmChip *chip = chips->data[i]; // The chip of interest
@@ -27,4 +33,10 @@
                   )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, -1);
+    PS_ASSERT_PTR_NON_NULL(name, -1);
+    if (strlen(name) == 0) {
+        return -1;
+    }
+
     psArray *cells = chip->cells;    // Array of cells
     for (int i = 0; i < cells->n; i++) {