diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index 362b0ba4..0a160f19 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -608,8 +608,8 @@ public class CaldavConnection extends AbstractConnection {
             for (String href : request.getHrefs()) {
                 DavGatewayTray.debug(new BundleMessage("LOG_REPORT_EVENT", ++count, total));
                 DavGatewayTray.switchIcon();
+                String eventName = getEventFileNameFromPath(href);
                 try {
-                    String eventName = getEventFileNameFromPath(href);
                     // ignore cases for Sunbird
                     if (eventName != null && eventName.length() > 0
                             && !"inbox".equals(eventName) && !"calendar".equals(eventName)) {
@@ -618,7 +618,7 @@ public class CaldavConnection extends AbstractConnection {
                         appendEventResponse(response, request, event);
                     }
                 } catch (HttpException e) {
-                    DavGatewayTray.warn(new BundleMessage("LOG_EVENT_NOT_FOUND", href));
+                    DavGatewayTray.warn(new BundleMessage("LOG_EVENT_NOT_AVAILABLE", eventName, href));
                     notFound.add(href);
                 }
             }
diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties
index 764c1c38..3570fea1 100644
--- a/src/java/davmailmessages.properties
+++ b/src/java/davmailmessages.properties
@@ -47,7 +47,7 @@ LOG_ERROR_LOADING_OSXADAPTER=Error while loading the OSXAdapter
 LOG_ERROR_LOADING_SETTINGS=Error loading settings
 LOG_ERROR_RETRIEVING_MESSAGE=Error retreiving message
 LOG_ERROR_WAITING_FOR_SWT_INIT=Error waiting for SWT init
-LOG_EVENT_NOT_FOUND=Event not found: {0}
+LOG_EVENT_NOT_AVAILABLE=Event {0} not available: {1}
 LOG_EXCEPTION_CLOSING_CLIENT_INPUT_STREAM=Exception closing client input stream
 LOG_EXCEPTION_CLOSING_CLIENT_OUTPUT_STREAM=Exception closing client output stream
 LOG_EXCEPTION_CLOSING_CLIENT_SOCKET=Exception closing client socket
diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties
index e23c429d..d1508d79 100644
--- a/src/java/davmailmessages_fr.properties
+++ b/src/java/davmailmessages_fr.properties
@@ -46,7 +46,7 @@ LOG_ERROR_LOADING_OSXADAPTER=Erreur au chargement de OSXAdapter
 LOG_ERROR_LOADING_SETTINGS=Erreur de chargement de la configuration
 LOG_ERROR_RETRIEVING_MESSAGE=Erreur lors la récupération du message
 LOG_ERROR_WAITING_FOR_SWT_INIT=Erreur d''initialisation SWT
-LOG_EVENT_NOT_FOUND=Evenement non trouvé : {0}
+LOG_EVENT_NOT_AVAILABLE=Evènement {0} non disponible : {1}
 LOG_EXCEPTION_CLOSING_CLIENT_INPUT_STREAM=Erreur à la fermeture du flux d''entrée client
 LOG_EXCEPTION_CLOSING_CLIENT_OUTPUT_STREAM=Erreur à la fermeture du flux de sortie client
 LOG_EXCEPTION_CLOSING_CLIENT_SOCKET=Erreur à la fermeture de la connection client