Index: yelp-2.24.0/src/yelp-window.c
===================================================================
--- yelp-2.24.0.orig/src/yelp-window.c	2009-02-28 13:38:38.000000000 -0500
+++ yelp-2.24.0/src/yelp-window.c	2009-02-28 13:40:14.000000000 -0500
@@ -2414,6 +2414,7 @@
 			    window->priv->uri,
 			    -1);
     g_free (window->priv->uri);
+    window->priv->uri = NULL;
 }
 
 static void
@@ -2421,6 +2422,7 @@
 {
     yelp_window_load (window, window->priv->uri);
     g_free (window->priv->uri);
+    window->priv->uri = NULL;
 }
 
 static void
@@ -2429,6 +2431,7 @@
     g_signal_emit (window, signals[NEW_WINDOW_REQUESTED], 0,
 		   window->priv->uri);
     g_free (window->priv->uri);
+    window->priv->uri = NULL;
 }
 
 /* TODO: This doesn't work... */
@@ -2448,6 +2451,7 @@
 			    mail_address,
 			    -1);
     g_free (window->priv->uri);
+    window->priv->uri = NULL;
     g_strfreev(split_string);
 }