diff --git a/src/emacs.c b/src/emacs.c
index e83e46af14b..4d4e57c522b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1975,8 +1975,8 @@ shut_down_emacs (sig, no_x, stuff)
 #ifdef HAVE_X_WINDOWS
   /* It's not safe to call intern here.  Maybe we are crashing.  */
   if (!noninteractive && SYMBOLP (Vwindow_system)
-      && XSYMBOL (Vwindow_system)->name->size == 1
-      && XSYMBOL (Vwindow_system)->name->data[0] == 'x'
+      && XSTRING (SYMBOL_NAME (Vwindow_system))->size == 1
+      && XSTRING (SYMBOL_NAME (Vwindow_system))->data[0] == 'x'
       && ! no_x)
     Fx_close_current_connection ();
 #endif /* HAVE_X_WINDOWS */