diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
index e2adb07..a28db7e 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
@@ -1129,6 +1129,11 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 								@Override
 								public void onFailure(Throwable caught) {
 									explorerPanel.getAsycTreePanel().unmask();
+									if(caught instanceof SessionExpiredException){
+										GWT.log("Session expired");
+										eventBus.fireEvent(new SessionExpiredEvent());
+										return;
+									}
 									new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " saving smart folder.", null);
 									explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot();
 
@@ -1360,6 +1365,11 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 									@Override
 									public void onFailure(Throwable caught) {
 										explorerPanel.getAsycTreePanel().unmask();
+										if(caught instanceof SessionExpiredException){
+											GWT.log("Session expired");
+											eventBus.fireEvent(new SessionExpiredEvent());
+											return;
+										}
 										new MessageBoxAlert("Error", caught.getMessage(), null);
 									}
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
index 721473a..12557b4 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
@@ -972,6 +972,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 		workspaceLogger.trace("create folder: "+nameFolder +" parent is null"+parent==null);
 
+		if(isSessionExpired())
+			throw new SessionExpiredException();
+
 		try {
 
 			if(nameFolder == null)
@@ -1164,6 +1167,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public SmartFolderModel createSmartFolder(String name, String description, String query, String parentId) throws Exception {
 
+		if(isSessionExpired())
+			throw new SessionExpiredException();
+
 		try {
 
 			Workspace workspace = getWorkspace();