diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index 6e922bf2b..12a09f811 100644
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -322,8 +322,12 @@ void pa__done(pa_module *m) {
     if (!(u = m->userdata))
         return;
 
-    while ((session = pa_hashmap_steal_first(u->sessions)))
-        free_session(session);
+    if (u->sessions) {
+        while ((session = pa_hashmap_steal_first(u->sessions)))
+            free_session(session);
+
+        pa_hashmap_free(u->sessions, NULL, NULL);
+    }
 
     if (u->connection)
         pa_dbus_connection_unref(u->connection);
diff --git a/src/modules/module-x11-xsmp.c b/src/modules/module-x11-xsmp.c
index 9994f99d7..ada9e1438 100644
--- a/src/modules/module-x11-xsmp.c
+++ b/src/modules/module-x11-xsmp.c
@@ -52,7 +52,6 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);
 PA_MODULE_USAGE("session_manager=<session manager string> display=<X11 display>");
 
-
 static pa_bool_t ice_in_use = FALSE;
 
 static const char* const valid_modargs[] = {