diff --git a/server/routers/client/updateClient.ts b/server/routers/client/updateClient.ts
index 0dd75186..0fbb2a47 100644
--- a/server/routers/client/updateClient.ts
+++ b/server/routers/client/updateClient.ts
@@ -341,8 +341,8 @@ export async function updateClient(
                         });
                     } catch (error) {
                         if (axios.isAxiosError(error)) {
-                            throw new Error(
-                                `Error communicating with Gerbil. Make sure Pangolin can reach the Gerbil HTTP API: ${error.response?.status}`
+                            logger.error(
+                                `Error updating destinations (can Pangolin see Gerbil HTTP API?) for exit node at ${destination.reachableAt} (status: ${error.response?.status}): ${error.message}`
                             );
                         }
                         throw error;
diff --git a/server/routers/gerbil/peers.ts b/server/routers/gerbil/peers.ts
index 70c56e04..e62c7c8f 100644
--- a/server/routers/gerbil/peers.ts
+++ b/server/routers/gerbil/peers.ts
@@ -1,15 +1,24 @@
-import axios from 'axios';
-import logger from '@server/logger';
+import axios from "axios";
+import logger from "@server/logger";
 import { db } from "@server/db";
-import { exitNodes } from '@server/db';
-import { eq } from 'drizzle-orm';
+import { exitNodes } from "@server/db";
+import { eq } from "drizzle-orm";
 
-export async function addPeer(exitNodeId: number, peer: {
-    publicKey: string;
-    allowedIps: string[];
-}) {
-    logger.info(`Adding peer with public key ${peer.publicKey} to exit node ${exitNodeId}`);
-    const [exitNode] = await db.select().from(exitNodes).where(eq(exitNodes.exitNodeId, exitNodeId)).limit(1);
+export async function addPeer(
+    exitNodeId: number,
+    peer: {
+        publicKey: string;
+        allowedIps: string[];
+    }
+) {
+    logger.info(
+        `Adding peer with public key ${peer.publicKey} to exit node ${exitNodeId}`
+    );
+    const [exitNode] = await db
+        .select()
+        .from(exitNodes)
+        .where(eq(exitNodes.exitNodeId, exitNodeId))
+        .limit(1);
     if (!exitNode) {
         throw new Error(`Exit node with ID ${exitNodeId} not found`);
     }
@@ -18,25 +27,37 @@ export async function addPeer(exitNodeId: number, peer: {
     }
 
     try {
-        const response = await axios.post(`${exitNode.reachableAt}/peer`, peer, {
-            headers: {
-                'Content-Type': 'application/json',
+        const response = await axios.post(
+            `${exitNode.reachableAt}/peer`,
+            peer,
+            {
+                headers: {
+                    "Content-Type": "application/json"
+                }
             }
-        });
+        );
 
-        logger.info('Peer added successfully:', { peer: response.data.status });
+        logger.info("Peer added successfully:", { peer: response.data.status });
         return response.data;
     } catch (error) {
         if (axios.isAxiosError(error)) {
-            throw new Error(`Error communicating with Gerbil. Make sure Pangolin can reach the Gerbil HTTP API: ${error.response?.status}`);
+            logger.error(
+                `Error adding peer (can Pangolin see Gerbil HTTP API?) for exit node at ${exitNode.reachableAt} (status: ${error.response?.status}): ${error.message}`
+            );
         }
         throw error;
     }
 }
 
 export async function deletePeer(exitNodeId: number, publicKey: string) {
-    logger.info(`Deleting peer with public key ${publicKey} from exit node ${exitNodeId}`);
-    const [exitNode] = await db.select().from(exitNodes).where(eq(exitNodes.exitNodeId, exitNodeId)).limit(1);
+    logger.info(
+        `Deleting peer with public key ${publicKey} from exit node ${exitNodeId}`
+    );
+    const [exitNode] = await db
+        .select()
+        .from(exitNodes)
+        .where(eq(exitNodes.exitNodeId, exitNodeId))
+        .limit(1);
     if (!exitNode) {
         throw new Error(`Exit node with ID ${exitNodeId} not found`);
     }
@@ -44,12 +65,16 @@ export async function deletePeer(exitNodeId: number, publicKey: string) {
         throw new Error(`Exit node with ID ${exitNodeId} is not reachable`);
     }
     try {
-        const response = await axios.delete(`${exitNode.reachableAt}/peer?public_key=${encodeURIComponent(publicKey)}`);
-        logger.info('Peer deleted successfully:', response.data.status);
+        const response = await axios.delete(
+            `${exitNode.reachableAt}/peer?public_key=${encodeURIComponent(publicKey)}`
+        );
+        logger.info("Peer deleted successfully:", response.data.status);
         return response.data;
     } catch (error) {
         if (axios.isAxiosError(error)) {
-            throw new Error(`Error communicating with Gerbil. Make sure Pangolin can reach the Gerbil HTTP API: ${error.response?.status}`);
+            logger.error(
+                `Error deleting peer (can Pangolin see Gerbil HTTP API?) for exit node at ${exitNode.reachableAt} (status: ${error.response?.status}): ${error.message}`
+            );
         }
         throw error;
     }
diff --git a/server/routers/gerbil/updateHolePunch.ts b/server/routers/gerbil/updateHolePunch.ts
index 6d64249c..74c4611b 100644
--- a/server/routers/gerbil/updateHolePunch.ts
+++ b/server/routers/gerbil/updateHolePunch.ts
@@ -203,8 +203,8 @@ export async function updateHolePunch(
                     });
                 } catch (error) {
                     if (axios.isAxiosError(error)) {
-                        throw new Error(
-                            `Error communicating with Gerbil. Make sure Pangolin can reach the Gerbil HTTP API: ${error.response?.status}`
+                        logger.error(
+                            `Error updating destinations (can Pangolin see Gerbil HTTP API?) for exit node at ${destination.reachableAt} (status: ${error.response?.status}): ${error.message}`
                         );
                     }
                     throw error;
diff --git a/server/routers/newt/handleGetConfigMessage.ts b/server/routers/newt/handleGetConfigMessage.ts
index 2d6ed98b..72e82e23 100644
--- a/server/routers/newt/handleGetConfigMessage.ts
+++ b/server/routers/newt/handleGetConfigMessage.ts
@@ -128,8 +128,8 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
                 });
             } catch (error) {
                 if (axios.isAxiosError(error)) {
-                    throw new Error(
-                        `Error communicating with Gerbil. Make sure Pangolin can reach the Gerbil HTTP API: ${error.response?.status}`
+                    logger.error(
+                        `Error updating proxy mapping (can Pangolin see Gerbil HTTP API?) for exit node at ${exitNode.reachableAt} (status: ${error.response?.status}): ${error.message}`
                     );
                 }
                 throw error;