Index: trunk/Ohana/src/opihi/dvo/dbFields.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbFields.c	(revision 14191)
+++ trunk/Ohana/src/opihi/dvo/dbFields.c	(revision 14287)
@@ -7,5 +7,5 @@
   if (fields == NULL) return;
 
-  for (i = 0; i <= Nfields; i++) {
+  for (i = 0; i < Nfields; i++) {
     if (fields[i].name != NULL) free (fields[i].name);
     if (fields[i].photcode != NULL) {
@@ -68,4 +68,8 @@
   }
   code = GetPhotcodebyName (tmpstring);
+  if (!code) {
+      return NULL;
+  }
+
 
   // enforce compatibility