diff --git a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData.ts b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData.ts
index a098719..af9ee24 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData.ts
@@ -1,18 +1,16 @@
+import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
 import API from "@/services/api/Api";
 import { Methods } from "@/services/api/enums/ApiMethodEnum";
 
-export default async function GTBTipoLogradouroIndexData() {
+async function executeGTBTipoLogradouroIndexData() {
 
     const api = new API();
-    try {
-        const dados = await api.send({
-            method: Methods.GET,
-            endpoint: `administrativo/g_tb_tipologradouro/`
-        });
-        return dados
-    } catch (error) {
-        console.log(error)
-        return error
-    }
 
-}
\ No newline at end of file
+    return await api.send({
+        method: Methods.GET,
+        endpoint: `administrativo/g_tb_tipologradouro/`
+    });
+
+}
+
+export const GTBTipoLogradouroIndexData = withClientErrorHandler(executeGTBTipoLogradouroIndexData)
\ No newline at end of file
diff --git a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData.ts b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData.ts
index 9a1799e..dcac9eb 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData.ts
@@ -1,8 +1,9 @@
 import API from "@/services/api/Api";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
 import { Methods } from "@/services/api/enums/ApiMethodEnum";
+import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
 
-export default async function GTBTipoLogradouroRemoveData(data: GTBTipoLogradouroInterface) {
+async function executeGTBTipoLogradouroRemoveData(data: GTBTipoLogradouroInterface) {
 
     const api = new API();
 
@@ -11,4 +12,6 @@ export default async function GTBTipoLogradouroRemoveData(data: GTBTipoLogradour
         endpoint: `administrativo/g_tb_tipologradouro/${data.tb_tipologradouro_id}`
     });
 
-}
\ No newline at end of file
+}
+
+export const GTBTipoLogradouroRemoveData = withClientErrorHandler(executeGTBTipoLogradouroRemoveData)
\ No newline at end of file
diff --git a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData.ts b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData.ts
index 5508890..c19be22 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData.ts
@@ -1,8 +1,9 @@
 import API from "@/services/api/Api";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
 import { Methods } from "@/services/api/enums/ApiMethodEnum";
+import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
 
-export default async function GTBTipoLogradouroSaveData(data: GTBTipoLogradouroInterface) {
+async function executeGTBTipoLogradouroSaveData(data: GTBTipoLogradouroInterface) {
 
     const isUpdate = Boolean(data.tb_tipologradouro_id);
 
@@ -14,4 +15,6 @@ export default async function GTBTipoLogradouroSaveData(data: GTBTipoLogradouroI
         body: data
     });
 
-}
\ No newline at end of file
+}
+
+export const GTBTipoLogradouroSaveData = withClientErrorHandler(executeGTBTipoLogradouroSaveData)
\ No newline at end of file
diff --git a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroReadHook.ts b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroReadHook.ts
index a452e29..c5bdb76 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroReadHook.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroReadHook.ts
@@ -1,7 +1,7 @@
 import { useResponse } from "@/app/_response/ResponseContext"
 import { useState } from "react";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
-import GTBTipoLogradouroIndexService from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService";
+import { GTBTipoLogradouroIndexService } from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService";
 
 export const useGTBTipoLogradouroReadHook = () => {
 
diff --git a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroRemoveHook.ts b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroRemoveHook.ts
index 529ae61..d2d9ea3 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroRemoveHook.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroRemoveHook.ts
@@ -1,6 +1,6 @@
 import { useResponse } from "@/app/_response/ResponseContext"
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
-import GTBTipoLogradouroRemoveService from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService";
+import { GTBTipoLogradouroRemoveService } from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService";
 
 export const useGTBTipoLogradouroRemoveHook = () => {
 
diff --git a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroSaveHook.ts b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroSaveHook.ts
index 668966d..25797a2 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroSaveHook.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_hooks/g_tb_tipologradouro/useGTBTipoLogradouroSaveHook.ts
@@ -1,7 +1,7 @@
 import { useResponse } from "@/app/_response/ResponseContext"
 import { useState } from "react";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
-import GTBTipoLogradouroSaveService from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService";
+import { GTBTipoLogradouroSaveService } from "../../_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService";
 
 export const useGTBTipoLogradouroSaveHook = () => {
 
diff --git a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService.ts b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService.ts
index b08ea02..71140a5 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroIndexService.ts
@@ -1,5 +1,5 @@
 import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
-import GTBTipoLogradouroIndexData from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData";
+import { GTBTipoLogradouroIndexData } from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroIndexData";
 
 async function executeGTBTipoLogradouroIndexService() {
 
diff --git a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService.ts b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService.ts
index c82594d..49cb957 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroRemoveService.ts
@@ -1,5 +1,5 @@
 import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
-import GTBTipoLogradouroRemoveData from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData";
+import { GTBTipoLogradouroRemoveData } from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroRemoveData";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
 
 async function executeGTBTipoLogradouroRemoveService(data: GTBTipoLogradouroInterface) {
diff --git a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService.ts b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService.ts
index 494bad6..d0b8249 100644
--- a/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService.ts
+++ b/src/app/(protected)/(cadastros)/cadastros/_services/g_tb_tipologradouro/GTBTipoLogradouroSaveService.ts
@@ -1,5 +1,5 @@
 import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
-import GTBTipoLogradouroSaveData from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData";
+import { GTBTipoLogradouroSaveData } from "../../_data/GTBTipoLogradouro/GTBTipoLogradouroSaveData";
 import { GTBTipoLogradouroInterface } from "../../_interfaces/GTBTipoLogradouroInterface";
 
 async function executeGTBTipoLogradouroSaveService(data: GTBTipoLogradouroInterface) {