--- vinagre-0.3/src/vinagre-favorites.c.old	2007-10-25 16:27:57.000000000 +0100
+++ vinagre-0.3/src/vinagre-favorites.c	2007-10-25 16:28:08.000000000 +0100
@@ -159,7 +159,7 @@ vinagre_favorites_add (VinagreConnection
 			      name,
 			      "port",
 			      conn->port);
-      if (strlen(conn->password) > 0)
+      if (conn->password != NULL && strlen(conn->password) > 0)
 	g_key_file_set_string (favorites,
 			       name,
 			       "password",