diff --git a/lisp/window.el b/lisp/window.el
index cfd9876ed0..7a636bb039 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4686,6 +4686,12 @@ switch-to-prev-buffer
 	(set-window-next-buffers
 	 window (delq buffer (window-next-buffers window)))))

+    (when (and (eq bury-or-kill 'kill)
+               (window-live-p window)
+               (eq (window-buffer window) old-buffer))
+      (error "Could not replace buffer %s in window %s"
+             old-buffer window))
+
     ;; Return new-buffer.
     new-buffer))