1 files changed, 4 insertions, 2 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index da1ce089b9d..e447211a277 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10032,9 +10032,11 @@ delete_kboard (kb)
   *kbp = kb->next_kboard;
 
   /* Prevent a dangling reference to KB.  */
-  if (kb == current_kboard)
+  if (kb == current_kboard
+      && FRAMEP (selected_frame)
+      && FRAME_LIVE_P (XFRAME (selected_frame)))
     {
-      current_kboard = SELECTED_FRAME ()->kboard;
+      current_kboard = XFRAME (selected_frame)->kboard;
       if (current_kboard == kb)
         abort ();
     }