diff --git a/src/contact.c b/src/contact.c
index 839e7d10..c57d1902 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -241,7 +241,6 @@ _get_most_available_resource(PContact contact)
         resources = g_list_next(resources);
     }
     free(resources);
-    free(current);
 
     return highest;
 }
diff --git a/src/ui/core.c b/src/ui/core.c
index 30f79659..254af048 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -137,7 +137,9 @@ _ui_get_idle_time(void)
         XFree(info);
         return result;
     }
-    XFree(info);
+    if (info != NULL) {
+        XFree(info);
+    }
 // if no libxss or xss idle time failed, use profanity idle time
 #endif
     gdouble seconds_elapsed = g_timer_elapsed(ui_idle_time, NULL);