diff --git a/pom.xml b/pom.xml
index 8404a62..f8794eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -398,12 +398,6 @@
 			<version>8.3.3</version>
 		</dependency>
 		
-		<dependency>
-			<groupId>org.gcube.social-networking</groupId>
-			<artifactId>social-service-client</artifactId>
-			<version>[1.1.0, 2.0.0)</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-library</artifactId>
diff --git a/src/main/java/org/gcube/data/access/storagehub/handlers/ClassHandler.java b/src/main/java/org/gcube/data/access/storagehub/handlers/ClassHandler.java
index 66d1d89..ed5cb4b 100644
--- a/src/main/java/org/gcube/data/access/storagehub/handlers/ClassHandler.java
+++ b/src/main/java/org/gcube/data/access/storagehub/handlers/ClassHandler.java
@@ -40,7 +40,7 @@ public class ClassHandler {
 
 		Set<Class<?>> classesAnnotated = reflection.getTypesAnnotatedWith(RootNode.class);
 		for (Class<?> clazz: classesAnnotated ){
-			if (RootItem.class.isAssignableFrom(clazz)) {
+			if (RootItem.class.isAssignableFrom(clazz) && clazz.isAnnotationPresent(RootNode.class)) {
 				String value =  clazz.getAnnotation(RootNode.class).value();
 				log.debug("loading class {} with value {} ", clazz, value );
 				classMap.put(value, (Class<? extends RootItem>) clazz);
diff --git a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
index 0932ca1..307c8ae 100644
--- a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
+++ b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
@@ -269,7 +269,8 @@ public class UserManager {
 			Node homeNode = session.getNode("/Home");
 			Node userHome = homeNode.getNode(user);
 
-
+			if (userHome == null)
+				throw new BackendGenericError("home for user {} not found");
 
 			/*
 			//creating workspace folder
@@ -282,7 +283,7 @@ public class UserManager {
 				org.gcube.common.storagehub.model.Path workspacePath = Paths.append(Paths.getPath(userHome.getPath()),Constants.WORKSPACE_ROOT_FOLDER_NAME);
 				Boolean oldTrashExists = session.nodeExists(Paths.append(workspacePath, Constants.TRASH_ROOT_FOLDER_NAME).toPath());
 				if (oldTrashExists)
-					session.move(Paths.append(workspacePath, Constants.TRASH_ROOT_FOLDER_NAME).toPath(), Paths.append(Paths.getPath(homeNode.getPath()), Constants.TRASH_ROOT_FOLDER_NAME).toPath());
+					session.move(Paths.append(workspacePath, Constants.TRASH_ROOT_FOLDER_NAME).toPath(), Paths.append(Paths.getPath(userHome.getPath()), Constants.TRASH_ROOT_FOLDER_NAME).toPath());
 				else {
 					FolderCreationParameters trashFolderParameters = FolderCreationParameters.builder().name(Constants.TRASH_ROOT_FOLDER_NAME).description("trash of "+user).author(user).on(userHome.getIdentifier()).with(session).build();
 					Utils.createFolderInternally(trashFolderParameters,  null, true);
@@ -291,7 +292,7 @@ public class UserManager {
 				Boolean oldVresExists = session.nodeExists(Paths.append(workspacePath, Constants.OLD_VRE_FOLDER_PARENT_NAME).toPath());
 
 				if (oldVresExists)
-					session.move(Paths.append(workspacePath, Constants.OLD_VRE_FOLDER_PARENT_NAME).toPath(), Paths.append(Paths.getPath(homeNode.getPath()), Constants.PERSONAL_VRES_FOLDER_PARENT_NAME).toPath());
+					session.move(Paths.append(workspacePath, Constants.OLD_VRE_FOLDER_PARENT_NAME).toPath(), Paths.append(Paths.getPath(userHome.getPath()), Constants.PERSONAL_VRES_FOLDER_PARENT_NAME).toPath());
 				else {
 					//creating Vre container folder
 					FolderCreationParameters vreFolderParameters = FolderCreationParameters.builder().name(Constants.PERSONAL_VRES_FOLDER_PARENT_NAME).description("vre folder container of "+user).author(user).on(userHome.getIdentifier()).with(session).build();
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
index 9f5b4db..6273013 100644
--- a/src/main/webapp/WEB-INF/README
+++ b/src/main/webapp/WEB-INF/README
@@ -25,7 +25,7 @@ The projects leading to this software have received funding from a series of
 Version
 --------------------------------------------------
  
-1.5.0-SNAPSHOT (20221003-152207)
+1.5.0-SNAPSHOT (20221004-105146)
  
 Please see the file named "changelog.xml" in this directory for the release notes.