Index: /trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- /trunk/Ohana/src/addstar/include/addstar.h	(revision 41474)
+++ /trunk/Ohana/src/addstar/include/addstar.h	(revision 41475)
@@ -341,4 +341,6 @@
 void resort_catalog_galphot (Catalog *catalog);
 
+void GetConfig (char *config, char *field, char *format, int N, void *ptr);
+
 /** 
     there is an inconsistency to be resolved: fixed structures (like Image)
Index: /trunk/Ohana/src/addstar/src/ConfigInit.c
===================================================================
--- /trunk/Ohana/src/addstar/src/ConfigInit.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/ConfigInit.c	(revision 41475)
@@ -1,5 +1,3 @@
 # include "addstar.h"
-
-void GetConfig (char *config, char *field, char *format, int N, void *ptr);
 
 AddstarClientOptions ConfigInit (int *argc, char **argv) {
Index: /trunk/Ohana/src/addstar/src/LoadStars.c
===================================================================
--- /trunk/Ohana/src/addstar/src/LoadStars.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/LoadStars.c	(revision 41475)
@@ -3,5 +3,4 @@
 Catalog *LoadStars (char *filename, Image **images, off_t *Nimages, AddstarClientOptions *options) {
 
-  off_t *extsize;
   int i, Nfile, mode;
 
@@ -38,4 +37,5 @@
     off_t NimagesStart = *Nimages;
     Catalog *newcat = NULL;
+    off_t *extsize = NULL;
 
     // load PMM data if specified (these are not stored as FITS-tables)
@@ -47,4 +47,9 @@
     // otherwise, we have FITS-table files: parse their headers to determine the contents
     headers = LoadHeaders (f, &mode, &Nheaders);
+    if (Nheaders == 0) {
+      fprintf (stderr, "ERROR: no FITS headers in %s, is it a FITS file?\n", file[i].filename);
+      goto next_file;
+    }
+
     headerSets = MatchHeaders (&extsize, &NheaderSets, mode, headers, Nheaders);
     if (headerSets == NULL) {
Index: /trunk/Ohana/src/addstar/src/MatchHeaders.c
===================================================================
--- /trunk/Ohana/src/addstar/src/MatchHeaders.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/MatchHeaders.c	(revision 41475)
@@ -21,4 +21,6 @@
   char extname[80], exttype[80], exthead[80], xtension[80];
   HeaderSet *headerSets;
+
+  if (!Nheaders) return NULL;
 
   ALLOCATE (extsize[0], off_t, Nheaders);
Index: /trunk/Ohana/src/addstar/src/addstar.c
===================================================================
--- /trunk/Ohana/src/addstar/src/addstar.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/addstar.c	(revision 41475)
@@ -1,3 +1,4 @@
 # include "addstar.h"
+void help (void);
 
 # define RESETTIME { gettimeofday (&startTimer, (void *) NULL); }
@@ -21,4 +22,9 @@
 
   INITTIME;
+
+  /* check for help request */
+  if (get_argument (argc, argv, "-h"    )) help();
+  if (get_argument (argc, argv, "-help" )) help();
+  if (get_argument (argc, argv, "--help")) help();
 
   SetSignals ();
Index: /trunk/Ohana/src/addstar/src/args.c
===================================================================
--- /trunk/Ohana/src/addstar/src/args.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/args.c	(revision 41475)
@@ -1,4 +1,4 @@
 # include "addstar.h"
-static void help (void);
+void help (void);
 
 AddstarClientOptions args (int argc, char **argv, AddstarClientOptions options) {
@@ -430,5 +430,5 @@
 }
 
-static void help () {
+void help (void) {
 
   fprintf (stderr, "USAGE\n");
Index: /trunk/Ohana/src/addstar/src/args_parallel_client.c
===================================================================
--- /trunk/Ohana/src/addstar/src/args_parallel_client.c	(revision 41474)
+++ /trunk/Ohana/src/addstar/src/args_parallel_client.c	(revision 41475)
@@ -106,5 +106,5 @@
 }
 
-static void help () {
+static void help (void) {
 
   fprintf (stderr, "USAGE\n");