diff --git a/menu.c b/menu.c
index 889a3ce..3362af9 100644
--- a/menu.c
+++ b/menu.c
@@ -8,6 +8,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/wait.h>
+#include <glib.h>
 
 #include "dunst.h"
 #include "utils.h"
@@ -136,6 +137,7 @@ void invoke_action(const char *action)
      */
 void dispatch_menu_result(const char *input)
 {
+        g_strstrip(input);
         switch (input[0]) {
             case '#':
                 invoke_action(input + 1);
diff --git a/x.c b/x.c
index 5a104fb..2ad74d3 100644
--- a/x.c
+++ b/x.c
@@ -465,7 +465,10 @@ static void setopacity(Window win, unsigned long opacity)
          */
 gboolean x_mainloop_fd_prepare(GSource * source, gint * timeout)
 {
-        *timeout = -1;
+        if (timeout)
+                *timeout = -1;
+        else
+                g_print("BUG: x_mainloop_fd_prepare: timeout == NULL\n");
         return false;
 }
 
@@ -510,9 +513,9 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
                                              0) == settings.close_ks.sym
                             && settings.close_ks.mask == ev.xkey.state) {
                                 if (displayed) {
-                                        notification_close
-                                            (g_queue_peek_head_link(displayed)->
-                                             data, 2);
+                                        notification *n = g_queue_peek_head(displayed);
+                                        if (n)
+                                                notification_close(n, 2);
                                 }
                         }
                         if (settings.history_ks.str