diff --git a/ChangeLog b/ChangeLog
index 971225fa8..a57890ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,9 @@
      migration measure back in 2002 when constraints were new, but just
      adds risk now.
      bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@
+   - djm@cvs.openbsd.org 2009/08/31 20:56:02
+     [sftp-server.c]
+     check correct variable for error message, spotted by martynas@
 
 20091002
  - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/sftp-server.c b/sftp-server.c
index d144001bb..66c0c1d5f 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.86 2009/08/27 17:28:52 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.87 2009/08/31 20:56:02 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1368,7 +1368,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
 			break;
 		case 'u':
 			mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg);
-			if (cp != NULL)
+			if (errmsg != NULL)
 				fatal("Invalid umask \"%s\": %s",
 				    optarg, errmsg);
 			(void)umask(mask);