Index: trunk/Ohana/src/opihi/dvo/avextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/avextract.c	(revision 39457)
+++ trunk/Ohana/src/opihi/dvo/avextract.c	(revision 39574)
@@ -212,14 +212,14 @@
 
       m = average->measureOffset;
-      Measure *measure = needMeasure ? &catalog.measure[m] : NULL;
+      Measure *measure = needMeasure && average->Nmeasure ? &catalog.measure[m] : NULL;
 
       m = average->lensobjOffset;
-      Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
+      Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[m] : NULL;
 
       m = average->starparOffset;
-      StarPar *starpar = needStarpar ? &catalog.starpar[m] : NULL;
+      StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[m] : NULL;
 
       m = average->galphotOffset;
-      GalPhot *galphot = needGalphot ? &catalog.galphot[m] : NULL;
+      GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[m] : NULL;
 
       m = j*Nsecfilt;
@@ -227,5 +227,7 @@
 
       for (n = 0; n < Nfields; n++) {
-	// we are passing in the *first* measure, but average->Nmeasure gives the count
+	// for Measure, we are passing in the *first* measure, but average->Nmeasure gives the count
+	// for Secfilt, we are passing in the first entry; photcode.equiv gives the entry
+	// for Lensobj, we are passing in the first entry or NULL; photcode.equiv gives the entry
 	values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, galphot, &fields[n]);
       }