diff --git a/lib/ArgParser/arg_parser.c b/lib/ArgParser/arg_parser.c
index 55d55df1518..fe9989dafcc 100644
--- a/lib/ArgParser/arg_parser.c
+++ b/lib/ArgParser/arg_parser.c
@@ -321,6 +321,11 @@ parse_arguments(const arg_parser_t *parser, int argc, char **argv)
     interr("Input file name is not registered", 0, ERR_Fatal);
   }
 
+  /* Make sure input id provided */
+  if (argc == 1) {
+    compose_and_throw("no input files", ""); 
+  }
+
   /* First grab the source file name */
   if (*argv[1] != '-') {
     *parser->input_file_name_ptr = argv[1];
diff --git a/lib/ArgParser/debug_action.c b/lib/ArgParser/debug_action.c
index 3577322a6a4..c03f500496e 100644
--- a/lib/ArgParser/debug_action.c
+++ b/lib/ArgParser/debug_action.c
@@ -50,6 +50,10 @@ create_action_map(action_map_t **map)
 void
 destroy_action_map(action_map_t **map)
 {
+  if (*map == NULL) {
+      return;
+  }
+    
   /* Free flags data structure */
   hashmap_free((*map)->actions);