diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/system-settings/plugins/keyfile/nm-keyfile-connection.c
index b64c2f906e..ed56d69d2e 100644
--- a/system-settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c
@@ -88,7 +88,8 @@ update (NMSettingsConnectionInterface *connection,
 		success = parent_settings_connection_iface->update (connection, callback, user_data);
 	} else {
 		callback (connection, error, user_data);
-		g_error_free (error);
+		if (error)
+			g_error_free (error);
 		g_free (filename);
 	}