diff --git a/ChangeLog b/ChangeLog
index 7c311fd5a..4ff0c8832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
    - miod@cvs.openbsd.org 2003/06/25 22:39:36
      [sftp-server.c]
      Typo police: attribute is better written with an 'r'.
+   - markus@cvs.openbsd.org 2003/06/26 20:08:33
+     [readconf.c]
+     do not dump core for 'ssh -o proxycommand host'; ok deraadt@
 
 20030624
  - (dtucker) Have configure refer the user to config.log and
@@ -596,4 +599,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2826 2003/06/28 02:39:03 dtucker Exp $
+$Id: ChangeLog,v 1.2827 2003/06/28 02:40:12 dtucker Exp $
diff --git a/readconf.c b/readconf.c
index 2a77ea14f..a01d7a33e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.112 2003/05/16 03:27:12 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.113 2003/06/26 20:08:33 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -546,6 +546,8 @@ parse_string:
 		goto parse_string;
 
 	case oProxyCommand:
+		if (s == NULL)
+			fatal("%.200s line %d: Missing argument.", filename, linenum);
 		charptr = &options->proxy_command;
 		len = strspn(s, WHITESPACE "=");
 		if (*activep && *charptr == NULL)