--- picsmap.c	2017-05-27 20:19:58.000000000 -0400
+++ picsmap.c.new	2018-04-16 08:39:17.056213014 -0400
@@ -84,8 +84,10 @@
 static void
 free_data(char **data)
 {
-    free(data[0]);
-    free(data);
+    if (data) {
+        free(data[0]);
+        free(data);
+    }
 }
 
 static void
@@ -149,7 +151,7 @@
 {
     static const char *msg[] =
     {
-	"Usage: picsmap [-x rgb-path] [xbm-file [...]]"
+	"Usage: picsmap [-r rgb-path] [xbm-/xpm-file [...]]"
     };
     size_t n;
 
@@ -824,7 +826,7 @@
 	}
     }
 
-    if (argc > 1) {
+    if (argc > optind) {
 	char **rgb_data = read_file(rgb_path);
 
 	if (rgb_data)
@@ -841,7 +843,7 @@
 	    endwin();
 	}
 
-	for (n = 1; n < argc; ++n) {
+	for (n = optind; n < argc; ++n) {
 	    PICS_HEAD *pics;
 	    char **data = read_file(argv[n]);