diff --git a/lisp/register.el b/lisp/register.el
index 76f05284c7b..451b6e01dc3 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -93,6 +93,8 @@ delete any existing frames that the frame configuration doesn't mention.
      ((window-configuration-p val)
       (set-window-configuration val))
      ((markerp val)
+      (or (marker-buffer val)
+	  (error "That register's buffer no longer exists"))
       (switch-to-buffer (marker-buffer val))
       (goto-char val))
      ((and (consp val) (eq (car val) 'file))