===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- src/usr.bin/tmux/server.c	2015/11/24 21:52:06	1.153
+++ src/usr.bin/tmux/server.c	2015/11/24 23:01:51	1.154
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.153 2015/11/24 21:52:06 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.154 2015/11/24 23:01:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -195,9 +195,11 @@
 	server_update_socket();
 	server_client_create(pair[1]);
 
-	unlink(lockfile);
-	free(lockfile);
-	close(lockfd);
+	if (lockfd >= 0) {
+		unlink(lockfile);
+		free(lockfile);
+		close(lockfd);
+	}
 
 	start_cfg();