diff --git a/components/MapComponent.js b/components/MapComponent.js
index a9ce0602b..2cd31ecb6 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -1193,15 +1193,23 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
 
   useEffect(() => {
     const fetchPoiData = async () => {
-      const response = await fetch("/api/talas_v5_DB/pois/poi-icons");
-      const data = await response.json();
-      setPoiData(data);
-      //console.log("poiData icons:", data);
+      try {
+        const response = await fetch("/api/talas_v5_DB/pois/poi-icons");
+        if (!response.ok) {
+          throw new Error("Network response was not ok");
+        }
+        const data = await response.json();
+        setPoiData(data);
+        console.log("poiData data:", data);
+        console.log("poiData icons:", poiData);
+      } catch (error) {
+        console.error("Fehler beim Abrufen der poiData:", error);
+      }
     };
 
     fetchPoiData();
   }, []);
-
+  //--------------------------------------------
   useEffect(() => {
     try {
       if (map && poiLayerRef.current && isPoiTypLoaded) {
@@ -2088,13 +2096,13 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
       try {
         const response = await fetch(webserviceGisLinesStatusUrl);
         const data = await response.json();
-        console.log("data.Statis: ", data);
+        //console.log("data.Statis: ", data);
         const colorsByModule = {};
         data.Statis.forEach((item) => {
           colorsByModule[item.Modul] = item.PrioColor;
         });
         setLineColors(colorsByModule);
-        console.log("colorsByModule", colorsByModule);
+        //console.log("colorsByModule", colorsByModule);
       } catch (error) {
         console.error("Fehler beim Abrufen der linesColorApi Daten:", error);
       }
@@ -2104,7 +2112,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
 
   // Überwachen des lineColors Zustandes
   useEffect(() => {
-    console.log("Aktualisierte lineColors", lineColors);
+    //console.log("Aktualisierte lineColors", lineColors);
   }, [lineColors]);
 
   const [linePositions, setLinePositions] = useState([]);
diff --git a/pages/api/talas_v5_DB/pois/poi-icons.js b/pages/api/talas_v5_DB/pois/poi-icons.js
index d563dac2d..ee092c226 100644
--- a/pages/api/talas_v5_DB/pois/poi-icons.js
+++ b/pages/api/talas_v5_DB/pois/poi-icons.js
@@ -2,35 +2,41 @@
 import mysql from "mysql";
 
 const dbConfig = {
-  //host: "10.10.0.13",
-  //host: "localhost",
   host: process.env.DB_HOST,
   user: process.env.DB_USER,
   password: process.env.DB_PASSWORD,
   database: process.env.DB_NAME,
   port: process.env.DB_PORT,
 };
+
 const connection = mysql.createConnection(dbConfig);
+
 connection.connect((err) => {
   if (err) {
     console.error("Fehler beim Verbinden:", err.stack);
     return;
   }
 });
+
 export default function handler(req, res) {
   if (req.method !== "GET") {
     return res.status(405).json({ error: "Nur GET Methode erlaubt" });
   }
 
   const query = `SELECT p.idPoi, i.path
-  FROM poi p
-  JOIN poiTyp pt ON p.idPoiTyp = pt.idPoiTyp
-  JOIN poiicons i ON pt.icon = i.idpoiicons;`;
+                 FROM poi p
+                 JOIN poiTyp pt ON p.idPoiTyp = pt.idPoiTyp
+                 JOIN poiicons i ON pt.icon = i.idpoiicons;`;
+
   connection.query(query, (error, results) => {
-    if (error) {
-      console.error("Fehler beim Abrufen der icons:", error);
-      return res.status(500).json({ error: "Fehler beim Abrufen der icons" });
+    try {
+      if (error) {
+        throw error;
+      }
+      res.json(results);
+    } catch (err) {
+      console.error("Fehler beim Abrufen der icons:", err);
+      res.status(500).json({ error: "Fehler beim Abrufen der icons" });
     }
-    res.json(results);
   });
 }