1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/gud.el b/lisp/gud.el
index d8544e8d878..fac1ae15705 100644
--- a/lisp/gud.el
+++ b/lisp/gud.el
@@ -809,14 +809,15 @@ comint mode, which see."
                         (setq w (cdr w)))
                       (car w)))
          (args (delq file-word (cdr words)))
-         (file (expand-file-name (substitute-in-file-name file-word)))
-         (filepart (file-name-nondirectory file)))
+         (file (and file-word
+                    (expand-file-name (substitute-in-file-name file-word))))
+         (filepart (and file-word (file-name-nondirectory file))))
       (switch-to-buffer (concat "*gud-" filepart "*"))
-      (setq default-directory (file-name-directory file))
+      (and file-word (setq default-directory (file-name-directory file)))
       (or (bolp) (newline))
       (insert "Current directory is " default-directory "\n")
       (apply 'make-comint (concat "gud-" filepart) program nil
-             (gud-massage-args file args)))
+             (if file-word (gud-massage-args file args))))
   (gud-mode)
   (set-process-filter (get-buffer-process (current-buffer)) 'gud-filter)
   (set-process-sentinel (get-buffer-process (current-buffer)) 'gud-sentinel)