diff --git a/emacs/mu4e-hdrs.el b/emacs/mu4e-hdrs.el
index 519cc328..02f42dbe 100644
--- a/emacs/mu4e-hdrs.el
+++ b/emacs/mu4e-hdrs.el
@@ -700,6 +700,8 @@ limit to up to `mu4e-search-results-limit'."
   "Mark message at point for moving to maildir TARGET. If target is
 not provided, function asks for it."
   (interactive)
+  (unless (mu4e-hdrs-get-docid)
+      (error "No message at point."))
   (with-current-buffer mu4e-hdrs-buffer
     (let* ((target (or target (mu4e-ask-maildir "Move message to: ")))
 	    (target (if (string= (substring target 0 1) "/")