* server.el (server-process-filter): Check for non-nil before calling

file-directory-p.

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/server.el b/lisp/server.el
index d3606f5c86..ad4608f2fd 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -952,7 +952,8 @@ The following commands are accepted by the client:
                    ;; Use the same cwd as the emacsclient, if possible, so
                    ;; relative file names work correctly, even in `eval'.
                    (let ((default-directory
-                           (if (file-directory-p dir) dir default-directory)))
+                           (if (and dir (file-directory-p dir))
+			       dir default-directory)))
                      (server-execute proc files nowait commands
                                      dontkill frame tty-name))))))