diff --git a/src/client.c b/src/client.c
index 03500cf..9e7edcf 100644
--- a/src/client.c
+++ b/src/client.c
@@ -153,7 +153,7 @@ client_gb_titlebar(Window w)
 {
      struct client *c = SLIST_FIRST(&W->h.client);
 
-     while(c && c->titlebar->win != w)
+     while(c && c->titlebar && c->titlebar->win != w)
           c = SLIST_NEXT(c, next);
 
      return c;
diff --git a/src/wmfs.c b/src/wmfs.c
index 568cbbc..901c44e 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -492,8 +492,6 @@ wmfs_quit(void)
           fclose(W->log), W->log = NULL;
 
      W->flags &= ~WMFS_RUNNING;
-
-     XCloseDisplay(W->dpy);
 }
 
 /** Reload WMFS binary
@@ -604,5 +602,7 @@ main(int argc, char **argv)
      if(r)
           execvp(argv[0], argv);
 
+     XCloseDisplay(W->dpy);
+
      return 1;
 }