diff --git a/doc/pamusb.conf b/doc/pamusb.conf
index 3a00875..0d46132 100644
--- a/doc/pamusb.conf
+++ b/doc/pamusb.conf
@@ -40,8 +40,8 @@ See http://www.pamusb.org/doc/configuring
 			<user id="scox">
 				<device>MyDevice</device>
 				<option name="quiet">true</option>
-				<agent event="lock">gnome-screensaver-command --lock</agent>
-				<agent event="unlock">gnome-screensaver-command --deactivate</agent>
+				<agent event="lock">gnome-screensaver-command -\-lock</agent>
+				<agent event="unlock">gnome-screensaver-command -\-deactivate</agent>
 			</user>
 
 			Configure user root to authenticate using MyDevice, but update one
diff --git a/src/volume.c b/src/volume.c
index 1b8fe86..c5a55e6 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -143,6 +143,7 @@ char *pusb_volume_get(t_pusb_options *opts, DBusConnection *dbus)
 	if (!mount_point)
 	{
 		log_error("Unable to retrieve %s mount point\n", volume_udi);
+		pusb_volume_destroy(mount_point);
 		return (NULL);
 	}
 	return (mount_point);
diff --git a/tools/pamusb-agent b/tools/pamusb-agent
index 2a29d75..ffb6b3d 100755
--- a/tools/pamusb-agent
+++ b/tools/pamusb-agent
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #
diff --git a/tools/pamusb-conf b/tools/pamusb-conf
index 03678fc..c253fb2 100755
--- a/tools/pamusb-conf
+++ b/tools/pamusb-conf
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #