diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 36968fbf8..db42a06ea 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -57,8 +57,7 @@
   (when (and (or (eq major-mode 'vm-summary-mode)
 		 (eq major-mode 'vm-presentation-mode))
 	     (save-window-excursion
-	       (condition-case nil (vm-select-folder-buffer)
-		 (error "Buffer not associated with any file"))))
+	       (vm-select-folder-buffer) buffer-file-name))
     (and (eq major-mode 'vm-presentation-mode) (vm-summarize))
     (vm-follow-summary-cursor)
     (save-excursion