Index: trunk/Ohana/src/opihi/dvo/LoadImages.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/LoadImages.c	(revision 4854)
+++ trunk/Ohana/src/opihi/dvo/LoadImages.c	(revision 4864)
@@ -10,13 +10,23 @@
 
   fits_db_init (&db);
+  db.lockstate = LCK_SOFT;
+  db.timeout   = 120.0;
+
   if (!fits_db_lock (&db, filename)) {
-    fprintf (stderr, "No available image catalog %s (1)\n", filename);
+    fprintf (stderr, "error opening image catalog %s (1)\n", filename);
     return (NULL);
   }
 
-  dvo_image_load (&db, TRUE);
+  if (db.dbstate == LCK_EMPTY) {
+    fprintf (stderr, "note: image catalog is empty\n");
+    ALLOCATE (image, Image, 1);
+    *nimage = 1;
+    return (image);
+  }
+
+  dvo_image_load (&db, TRUE, FALSE);
   fits_db_close (&db);
 
-  image = fits_table_get_Image (&db.ftable, nimage);
+  image = fits_table_get_Image (&db.ftable, nimage, &db.swapped);
   return (image);
 }