diff --git a/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java b/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java
index 54e113b2b..f4fc33389 100644
--- a/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java
+++ b/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java
@@ -40,6 +40,8 @@
 import org.exoplatform.webui.core.UIContainer;
 import org.exoplatform.webui.event.Event;
 import org.exoplatform.webui.event.EventListener;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
 
 @ComponentConfig(template = "system:/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl", events = { @EventConfig(listeners = UIStandaloneAppContainer.LogoutActionListener.class) })
 public class UIStandaloneAppContainer extends UIContainer {
@@ -124,6 +126,7 @@ public void processRender(WebuiRequestContext context) throws Exception {
     }
 
     public static class LogoutActionListener extends EventListener<UIComponent> {
+        private static final Logger log = LoggerFactory.getLogger(LogoutActionListener.class);
         public void execute(Event<UIComponent> event) throws Exception {
             StandaloneAppRequestContext context = (StandaloneAppRequestContext) event.getRequestContext();
             HttpServletRequest req = context.getRequest();
@@ -131,13 +134,25 @@ public void execute(Event<UIComponent> event) throws Exception {
             // Delete the token from JCR
             String token = getTokenCookie(req);
             if (token != null) {
-                AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
-                tokenService.deleteToken(token);
+                try {
+                    AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
+                    tokenService.deleteToken(token);
+                } catch (Exception ex) {
+                    if(log.isDebugEnabled()) {
+                        log.debug("Exception when try to remove cookieToken", ex);
+                    }
+                }
             }
             token = LoginServlet.getOauthRememberMeTokenCookie(req);
             if (token != null) {
-                AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
-                tokenService.deleteToken(token);
+                try {
+                    AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
+                    tokenService.deleteToken(token);
+                } catch (Exception ex) {
+                    if(log.isDebugEnabled()) {
+                        log.debug("Exception when try to remove oauthCookieToken", ex);
+                    }
+                }
             }
 
             LogoutControl.wantLogout();
diff --git a/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java b/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
index eac180c55..632c29268 100644
--- a/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
+++ b/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
@@ -58,6 +58,8 @@
 import org.exoplatform.webui.core.UIComponent;
 import org.exoplatform.webui.event.Event;
 import org.exoplatform.webui.event.EventListener;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
 import org.gatein.web.security.impersonation.ImpersonatedIdentity;
 import org.gatein.web.security.impersonation.ImpersonationUtils;
 
@@ -330,6 +332,7 @@ public void setDescription(String description) {
     }
 
     public static class LogoutActionListener extends EventListener<UIComponent> {
+        private static final Logger log = LoggerFactory.getLogger(LogoutActionListener.class);
         public void execute(Event<UIComponent> event) throws Exception {
             PortalRequestContext prContext = Util.getPortalRequestContext();
             HttpServletRequest req = prContext.getRequest();
@@ -347,13 +350,25 @@ public void execute(Event<UIComponent> event) throws Exception {
             // Delete the token from JCR
             String token = getTokenCookie(req);
             if (token != null) {
-                AbstractTokenService<GateInToken, String> tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
-                tokenService.deleteToken(token);
+                try {
+                    AbstractTokenService<GateInToken, String> tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
+                    tokenService.deleteToken(token);
+                } catch (Exception ex) {
+                    if(log.isDebugEnabled()) {
+                        log.debug("Exception when try to remove cookieToken", ex);
+                    }
+                }
             }
             token = LoginServlet.getOauthRememberMeTokenCookie(req);
             if(token != null) {
-                AbstractTokenService<GateInToken, String> tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
-                tokenService.deleteToken(token);
+                try {
+                    AbstractTokenService<GateInToken, String> tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
+                    tokenService.deleteToken(token);
+                } catch (Exception ex) {
+                    if(log.isDebugEnabled()) {
+                        log.debug("Exception when try to remove oauthCookieToken", ex);
+                    }
+                }
             }
 
             LogoutControl.wantLogout();