diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
index 7a3df35c..996f07e3 100644
--- a/src/cd-mapping-db.c
+++ b/src/cd-mapping-db.c
@@ -67,7 +67,7 @@ cd_mapping_db_open (CdMappingDb *mdb,
 		    GError  **error)
 {
 	CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
-	gchar *error_msg = NULL;
+	g_autofree gchar *error_msg = NULL;
 	gint rc;
 	g_autofree gchar *path = NULL;
 
@@ -116,7 +116,6 @@ cd_mapping_db_open (CdMappingDb *mdb,
 				     CD_CLIENT_ERROR_INTERNAL,
 				     "Cannot open mapping database: %s",
 				     error_msg);
-			sqlite3_free (error_msg);
 			return FALSE;
 		}
 	}
diff --git a/src/cd-profile-db.c b/src/cd-profile-db.c
index 5661d095..57ab864f 100644
--- a/src/cd-profile-db.c
+++ b/src/cd-profile-db.c
@@ -48,7 +48,7 @@ cd_profile_db_load (CdProfileDb *pdb,
 {
 	CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
 	const gchar *statement;
-	gchar *error_msg = NULL;
+	g_autofree gchar *error_msg = NULL;
 	gint rc;
 	g_autofree gchar *path = NULL;