diff --git a/ChangeLog b/ChangeLog
index 006db9783e..f41bdca04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-06  Dan Williams <dcbw@redhat.com>
+
+	* system-settings/src/nm-polkit-helpers.c
+		- (create_polkit_context): in PolicyKit 0.6, polkit_context_init() will
+			unref the context if the initialization fails; also avoid spew when
+			the error isn't set
+
 2008-06-06  Dan Williams <dcbw@redhat.com>
 
 	Patch from Tambet Ingo  <tambet@gmail.com>
diff --git a/system-settings/src/nm-polkit-helpers.c b/system-settings/src/nm-polkit-helpers.c
index 7ac336c807..3858d01b1f 100644
--- a/system-settings/src/nm-polkit-helpers.c
+++ b/system-settings/src/nm-polkit-helpers.c
@@ -86,10 +86,15 @@ create_polkit_context (void)
 	polkit_context_set_io_watch_functions (global_context, pk_io_add_watch, pk_io_remove_watch);
 	err = NULL;
 	if (!polkit_context_init (global_context, &err)) {
-		g_warning ("Cannot initialize libpolkit: %s", polkit_error_get_error_message (err));
-		polkit_error_free (err);
+		g_warning ("Cannot initialize libpolkit: %s",
+		           err ? polkit_error_get_error_message (err) : "unknown error");
+		if (err)
+			polkit_error_free (err);
 
+		/* PK 0.6's polkit_context_init() unrefs the global_context on failure */
+#if (POLKIT_VERSION_MAJOR == 0) && (POLKIT_VERSION_MINOR >= 7)
 		polkit_context_unref (global_context);
+#endif
 		global_context = NULL;
 	}