--- ../t/startup-notification-0.12/libsn/sn-common.c	2011-05-05 10:34:34.000000000 +0100
+++ ./libsn/sn-common.c	2011-09-13 12:25:44.259802525 +0100
@@ -146,26 +146,38 @@
   atom_reply = xcb_intern_atom_reply(display->xconnection,
                                      atom_utf8_string_c,
                                      NULL);
-  display->UTF8_STRING = atom_reply->atom;
-  free(atom_reply);
+  if (atom_reply)
+  {
+    display->UTF8_STRING = atom_reply->atom;
+    free(atom_reply);
+  }
 
   atom_reply = xcb_intern_atom_reply(display->xconnection,
                                      atom_net_startup_info_begin_c,
                                      NULL);
-  display->NET_STARTUP_INFO_BEGIN = atom_reply->atom;
-  free(atom_reply);
+  if (atom_reply)
+  {
+    display->NET_STARTUP_INFO_BEGIN = atom_reply->atom;
+    free(atom_reply);
+  }
 
   atom_reply = xcb_intern_atom_reply(display->xconnection,
                                      atom_net_startup_info_c,
                                      NULL);
-  display->NET_STARTUP_INFO = atom_reply->atom;
-  free(atom_reply);
+  if (atom_reply)
+  {
+    display->NET_STARTUP_INFO = atom_reply->atom;
+    free(atom_reply);
+  }
 
   atom_reply = xcb_intern_atom_reply(display->xconnection,
                                      atom_net_startup_id_c,
                                      NULL);
-  display->NET_STARTUP_ID = atom_reply->atom;
-  free(atom_reply);
+  if (atom_reply)
+  {
+    display->NET_STARTUP_ID = atom_reply->atom;
+    free(atom_reply);
+  }
 
   return display;
 }