2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8ade803d..768ad7fd 100644
--- a/NEWS
+++ b/NEWS
@@ -79,6 +79,8 @@
        exp(x)).
      * The controller player in a netgame is the first player to join,
        instead of just being someone who gets lucky.
+     * Check that an address is provided to the -query command line
+       option (thanks Sander van Dijk).
 
     libtextscreen:
      * The font used for the textscreen library can be forced by
diff --git a/src/d_main.c b/src/d_main.c
index 032c5caa..36382fb6 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -868,7 +868,7 @@ void D_DoomMain (void)
 
     p = M_CheckParm("-query");
 
-    if (p > 0)
+    if (p && p < myargc-1)
     {
         NET_QueryAddress(myargv[p+1]);
         exit(0);