diff --git a/ChangeLog b/ChangeLog
index 43eaf932007e3703b8faed349b2ffd9125bfa107..a152011cd3bd22f88f7242d6b2b244812addaa0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23	Nick Schermer <nick@xfce.org>
+
+	* thunar/main.c: Use -V for version information.
+
+2008-11-23	Jannis Pohlmann <jannis@xfce.org>
+
+	* thunar-vfs/thunar-vfs-volume-hal.c: Check if volumes are != NULL
+	  when handling "EjectPressed" events. This should fix bug #4257.
+	  Patch again supplied by Nick.
+
 2008-11-23	Jannis Pohlmann <jannis@xfce.org>
 
 	* thunar-vfs/thunar-vfs-volume-hal.c
diff --git a/thunar-vfs/thunar-vfs-volume-hal.c b/thunar-vfs/thunar-vfs-volume-hal.c
index 44202b75023db8e52eb1695e069a73cf01830f17..c17cd5439bba0e7a646fb8baeb8dbffe84674dc1 100644
--- a/thunar-vfs/thunar-vfs-volume-hal.c
+++ b/thunar-vfs/thunar-vfs-volume-hal.c
@@ -1207,7 +1207,7 @@ thunar_vfs_volume_manager_hal_device_condition (LibHalContext *context,
                 {
                   /* check if we have a mounted volume for this UDI */
                   volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, volume_udis[n]);
-                  if (thunar_vfs_volume_is_mounted (THUNAR_VFS_VOLUME (volume_hal)))
+                  if (volume_hal != NULL && thunar_vfs_volume_is_mounted (THUNAR_VFS_VOLUME (volume_hal)))
                     volumes = g_list_prepend (volumes, g_object_ref (G_OBJECT (volume_hal)));
                 }
               libhal_free_string_array (volume_udis);
diff --git a/thunar/main.c b/thunar/main.c
index 2e0a581887a65345fc58b191d625b92fa07bea8f..cd756d48c367e8339ff3daa1be683c0f7f958655 100644
--- a/thunar/main.c
+++ b/thunar/main.c
@@ -63,7 +63,7 @@ static GOptionEntry option_entries[] =
 #else
   { "quit", 'q', 0, G_OPTION_ARG_NONE, &opt_quit, N_ ("Quit a running Thunar instance (not supported)"), NULL, },
 #endif
-  { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, N_ ("Print version information and exit"), NULL, },
+  { "version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, N_ ("Print version information and exit"), NULL, },
   { NULL, },
 };