Index: trunk/Ohana/src/opihi/dvo/LoadImages.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/LoadImages.c	(revision 2598)
+++ trunk/Ohana/src/opihi/dvo/LoadImages.c	(revision 3393)
@@ -11,9 +11,18 @@
   VarConfig ("IMAGE_CATALOG", "%s", filename);
 
+  NIMAGE = 0;
+  Nimage = 0;
+  image  = NULL;
+
   /* check if image datafile exists, get header */
   if (!fits_read_header (filename, &header)) {
     fprintf (stderr, "No available image catalog %s (1)\n", filename);
-    *Nimage = 0;
-    return ((Image *) NULL);
+    return (NULL);
+  }
+
+  fits_scan (&header, "NIMAGES", "%d", 1, &NIMAGE);
+  if (NIMAGE == 0) {
+    fprintf (stderr, "no images found\n");
+    return (NULL);
   }
 
@@ -23,15 +32,5 @@
     fprintf (stderr, "No available image catalog: %s (2)\n", filename);
     free (header.buffer);
-    *Nimage = 0;
-    return ((Image *) NULL);
-  }
-
-  NIMAGE = 0;
-  fits_scan (&header, "NIMAGES", "%d", 1, &NIMAGE);
-  if (NIMAGE == 0) {
-    fprintf (stderr, "no images found\n");
-    *Nimage = NIMAGE;
-    fclose (f);
-    return ((Image *) NULL);
+    return (NULL);
   }
 
@@ -46,6 +45,3 @@
   *Nimage = nimage;
   return (image);
-
-
 }
-