diff --git a/src/shell-global.c b/src/shell-global.c
index 49ff2d7dd..e8705f5b0 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1249,7 +1249,7 @@ shell_global_reexec_self (ShellGlobal *global)
   char *buf;
   char *buf_p;
   char *buf_end;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   if (!g_file_get_contents ("/proc/self/cmdline", &buf, &len, &error))
     {
diff --git a/src/shell-perf-log.c b/src/shell-perf-log.c
index 95b116905..3bd5228a0 100644
--- a/src/shell-perf-log.c
+++ b/src/shell-perf-log.c
@@ -862,7 +862,7 @@ replay_to_json (gint64      time,
                 gpointer    user_data)
 {
   ReplayToJsonClosure *closure = user_data;
-  char *event_str;
+  g_autofree char *event_str = NULL;
 
   if (closure->error != NULL)
     return;