diff --git a/src/actions.c b/src/actions.c
index e573c145..af8155f6 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -166,7 +166,6 @@ void print_version()
   printf("\n");
   printf("This is free software; see the source for copying conditions.  There is NO\n");
   printf("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
-  exit(EXIT_SUCCESS);
 }
 
 char *escape_chars(const char *source)
diff --git a/src/options.c b/src/options.c
index 06b926ab..f4d7efd4 100644
--- a/src/options.c
+++ b/src/options.c
@@ -142,7 +142,8 @@ static void check_opt(char *opt, char *optval, int type)
 
     } else if( (type == SHORT && *opt == 'v') || (type == LONG && !strcmp("version", opt)) ) {
         print_version();
-
+        quit=1;
+        has_x=0;
     } else if( (type == SHORT && *opt == 't') || (type == LONG && !strcmp("tedax", opt)) ) {
         dbg(1, "process_options(): set netlist type to tEDAx\n");
         cli_opt_netlist_type=CAD_TEDAX_NETLIST;