diff --git a/distro/changelog.xml b/distro/changelog.xml
index 7b1cbf3..1937453 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,12 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-17-2"
+		date="2017-09-13">
+		<Change>Incident #9676: fixed. Removed check on get sub-folder public link when operation is performed by an administrator</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-17-1"
 		date="2017-07-10">
-		<Change>Added regex in order to remove list of chars when renaming or creating new item. It is different for folder and item name</Change>
+		<Change>Added regex in order to remove list of chars when renaming or
+			creating new item. It is different for folder and item name</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-17-0"
 		date="2017-05-22">
diff --git a/pom.xml b/pom.xml
index 0b7c743..366166b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.17.1-SNAPSHOT</version>
+	<version>6.17.2-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
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 aa420ea..0bd7347 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
@@ -712,16 +712,16 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 
 				GWT.log("RefreshFolderEvent: "+refreshItemEvent);
 
-				if(refreshItemEvent.getFolderTarget()!=null){
+				if(refreshItemEvent.getFolderTarget()!=null && refreshItemEvent.getFolderTarget().getIdentifier()!=null){
 
 					if(!refreshItemEvent.isIfExists()){ //Called Tree side
 						explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder());
 						notifySubscriber(refreshItemEvent);
 					}
 					else{ //Validating folder existence - called portlet side
-						FileModel target = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(refreshItemEvent.getFolderTarget().getIdentifier());
-						if(target!=null)
-							explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder());
+//						FileModel target = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(refreshItemEvent.getFolderTarget().getIdentifier());
+//						if(target!=null)
+						explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder());
 					}
 				}
 				else
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
index ed38e66..4dc4057 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
@@ -767,8 +767,9 @@ public class AsyncTreePanel extends LayoutContainer {
 	 * @param expandFolder the expand folder
 	 */
 	public void reloadTreeLevelAndExpandFolder(String folderIdentifier, boolean expandFolder){
-		final FolderModel folder = (FolderModel) getFileModelByIdentifier(folderIdentifier);
-		reloadTreeLevelAndExpandFolder(folder, expandFolder);
+		FolderModel folder = (FolderModel) getFileModelByIdentifier(folderIdentifier);
+		if(folder!=null)
+			reloadTreeLevelAndExpandFolder(folder, expandFolder);
 	}
 
 	/**
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 b751c4c..f7d3b6a 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
@@ -3569,12 +3569,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			workspaceLogger.info("Getting administator/s to folder: "+folderId);
 			WorkspaceFolder wsFolder = getSharedWorkspaceFolderForId(folderId);
-			if(isASharedFolder(wsFolder, true)){
-				GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
-				WorkspaceSharedFolder wsSharedFolder = (WorkspaceSharedFolder) wsFolder;
-				return builder.buildGxtInfoContactsFromPortalLogins(wsSharedFolder.getAdministrators());
-			}else
-				throw new WorkspaceHandledException("the item with "+folderId +" is not a base shared folder!");
+			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
+			WorkspaceSharedFolder wsSharedFolder = (WorkspaceSharedFolder) wsFolder;
+			return builder.buildGxtInfoContactsFromPortalLogins(wsSharedFolder.getAdministrators());
 
 		} catch (WorkspaceHandledException e){
 			workspaceLogger.error("Error in server getAdministratorsByFolderId: "+e.getMessage());