diff --git a/plugins/mm/calls-mm-call.c b/plugins/mm/calls-mm-call.c
index 13fb3ae..1db0c1a 100644
--- a/plugins/mm/calls-mm-call.c
+++ b/plugins/mm/calls-mm-call.c
@@ -212,7 +212,7 @@ operation_cb (MMCall                      *mm_call,
               struct CallsMMOperationData *data)
 {
   gboolean ok;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   ok = data->finish_func (mm_call, res, &error);
   if (!ok)
diff --git a/plugins/mm/calls-mm-origin.c b/plugins/mm/calls-mm-origin.c
index d31ec29..a7de408 100644
--- a/plugins/mm/calls-mm-origin.c
+++ b/plugins/mm/calls-mm-origin.c
@@ -303,7 +303,7 @@ dial_cb (MMModemVoice  *voice,
          CallsMMOrigin *self)
 {
   MMCall *call;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   call = mm_modem_voice_create_call_finish (voice, res, &error);
   if (!call)
@@ -370,7 +370,7 @@ delete_call_cb (MMModemVoice                       *voice,
                 struct CallsMMOriginDeleteCallData *data)
 {
   gboolean ok;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   ok = mm_modem_voice_delete_call_finish (voice, res, &error);
   if (!ok)
@@ -463,7 +463,7 @@ call_added_list_calls_cb (MMModemVoice                      *voice,
                           struct CallsMMOriginCallAddedData *data)
 {
   GList *calls;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   calls = mm_modem_voice_list_calls_finish (voice, res, &error);
   if (!calls)
@@ -585,7 +585,7 @@ list_calls_cb (MMModemVoice  *voice,
                CallsMMOrigin *self)
 {
   GList *calls, *node;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   calls = mm_modem_voice_list_calls_finish (voice, res, &error);
   if (!calls)
diff --git a/plugins/ofono/calls-ofono-call.c b/plugins/ofono/calls-ofono-call.c
index 557cf8a..8eb4a53 100644
--- a/plugins/ofono/calls-ofono-call.c
+++ b/plugins/ofono/calls-ofono-call.c
@@ -107,7 +107,7 @@ operation_cb (GDBOVoiceCall                 *voice_call,
               struct CallsCallOperationData *data)
 {
   gboolean ok;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   ok = data->finish_func (voice_call, res, &error);
   if (!ok)
diff --git a/plugins/ofono/calls-ofono-origin.c b/plugins/ofono/calls-ofono-origin.c
index 8e5bc6d..aa41321 100644
--- a/plugins/ofono/calls-ofono-origin.c
+++ b/plugins/ofono/calls-ofono-origin.c
@@ -67,7 +67,7 @@ dial_cb (GDBOVoiceCallManager  *voice,
          CallsOfonoOrigin      *self)
 {
   gboolean ok;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   ok = gdbo_voice_call_manager_call_dial_finish
     (voice, NULL, res, &error);
@@ -294,7 +294,7 @@ voice_call_proxy_new_cb (GDBusConnection *connection,
 {
   CallsOfonoOrigin *self = data->self;
   GDBOVoiceCall *voice_call;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
   const gchar *path;
   CallsOfonoCall *call;
 
@@ -402,7 +402,7 @@ get_calls_cb (GDBOVoiceCallManager *voice,
 {
   gboolean ok;
   GVariant *calls_with_properties = NULL;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
   GVariantIter *iter = NULL;
   const gchar *path;
   GVariant *properties;
@@ -443,7 +443,7 @@ voice_new_cb (GDBusConnection  *connection,
               GAsyncResult     *res,
               CallsOfonoOrigin *self)
 {
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
 
   self->voice = gdbo_voice_call_manager_proxy_new_finish
     (res, &error);
diff --git a/plugins/ofono/calls-ofono-provider.c b/plugins/ofono/calls-ofono-provider.c
index a5a5281..57f4451 100644
--- a/plugins/ofono/calls-ofono-provider.c
+++ b/plugins/ofono/calls-ofono-provider.c
@@ -314,7 +314,7 @@ get_modems_cb (GDBOManager *manager,
   gboolean ok;
   GVariant *modems;
   GVariantIter *modems_iter = NULL;
-  GError *error = NULL;
+  g_autoptr (GError) error = NULL;
   const gchar *path;
   GVariant *properties;