diff --git a/contrib/lang/scala/funcs.el b/contrib/lang/scala/funcs.el
index 834091318..2e3e8f758 100644
--- a/contrib/lang/scala/funcs.el
+++ b/contrib/lang/scala/funcs.el
@@ -18,9 +18,11 @@
 
 (defun scala/configure-ensime ()
   "Ensure the file exists before starting `ensime-mode'."
-  (if (file-exists-p (buffer-file-name))
-      (ensime-mode +1)
-    (add-hook 'after-save-hook (lambda () (ensime-mode +1)) nil t)))
+  (cond
+   ((and (buffer-file-name) (file-exists-p (buffer-file-name)))
+    (ensime-mode +1))
+   ((buffer-file-name)
+    (add-hook 'after-save-hook (lambda () (ensime-mode +1)) nil t))))
 
 (defun scala/maybe-start-ensime ()
   (when (buffer-file-name)