diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index c05dc0cf..8f66276b 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -160,7 +160,9 @@ public class CaldavConnection extends AbstractConnection {
         } catch (SocketException e) {
             DavGatewayTray.debug(new BundleMessage("LOG_CONNECTION_CLOSED"));
         } catch (Exception e) {
-            DavGatewayTray.log(e);
+            if (!(e instanceof HttpNotFoundException)) {
+                DavGatewayTray.log(e);
+            }
             try {
                 sendErr(e);
             } catch (IOException e2) {
diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index 9efb269b..07f27e72 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -20,6 +20,7 @@ package davmail.exchange.ews;
 
 import davmail.exception.DavMailAuthenticationException;
 import davmail.exception.DavMailException;
+import davmail.exception.HttpNotFoundException;
 import davmail.exchange.ExchangeSession;
 import davmail.http.DavGatewayHttpClientFacade;
 import davmail.util.IOUtil;
@@ -1041,7 +1042,7 @@ public class EwsExchangeSession extends ExchangeSession {
     private FolderId getFolderId(String folderPath) throws IOException {
         FolderId folderId = getFolderIdIfExists(folderPath);
         if (folderId == null) {
-            throw new DavMailException("EXCEPTION_FOLDER_NOT_FOUND", folderPath);
+            throw new HttpNotFoundException("Folder '"+folderPath+"' not found");
         }
         return folderId;
     }