diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 8734e7f4b..055df150a 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -1330,7 +1330,8 @@ matchlet_match (TreeMatchlet *matchlet,
             result = FALSE;
         }
 
-      g_clear_object (&info);
+      if (info)
+        g_object_unref (info);
       g_object_unref (file);
     }
   while (!result);
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 1016efbd2..e20f714e6 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -898,7 +898,8 @@ try_tcp (GDBusServer  *server,
 
  out:
   g_list_free_full (resolved_addresses, g_object_unref);
-  g_clear_object (&resolver);
+  if (resolver)
+    g_object_unref (resolver);
   return ret;
 }