diff --git a/parser-mecmd.c b/parser-mecmd.c
index 84c067b5df..ddee658a57 100644
--- a/parser-mecmd.c
+++ b/parser-mecmd.c
@@ -110,6 +110,8 @@ m_config_parse_me_command_line(m_config_t *config, int argc, char **argv)
 	    no++;
 	  } else {
 //	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "m_config_set_option() failed (%d)\n",tmp);
+	    if(tmp == M_OPT_EXIT)
+	      exit(0);
 	    goto err_out;
 	  }
 	}
diff --git a/parser-mpcmd.c b/parser-mpcmd.c
index b9db499754..e617eefc38 100644
--- a/parser-mpcmd.c
+++ b/parser-mpcmd.c
@@ -186,8 +186,11 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
 	  }
 	}
 
-	if (tmp < 0)
+	if (tmp < 0) {
+	  if (tmp == M_OPT_EXIT)
+	    exit(0);
 	  goto err_out;
+	}
 	i += tmp;
       }
     else /* filename */