diff --git a/ChangeLog b/ChangeLog
index 0cfd15f8..d967eb73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.13
+*05/04/25:
+  * Fixed #1188690, fbrun segfault (Mathias)
+    FbTk/App.cc
 *05/04/23:
   * Close of #956325 (Mathias)
        WorkspaceMenu -> left click on a item will jump TO that
diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc
index 8ced4a1f..084b8015 100644
--- a/src/FbTk/App.cc
+++ b/src/FbTk/App.cc
@@ -51,6 +51,8 @@ App::App(const char *displayname):m_done(false), m_display(0) {
     if (displayname != 0 && displayname[0] == '\0')
         displayname = 0;
     m_display = XOpenDisplay(displayname);
+    if (!m_display)
+        throw std::string("Couldn't connect to XServer");
 
     Font::init();
     Image::init();