diff --git a/src/main/java/org/gcube/resourcemanagement/support/client/Resource_support.java b/src/main/java/org/gcube/resourcemanagement/support/client/Resource_support.java
index b97add8..668731a 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/client/Resource_support.java
+++ b/src/main/java/org/gcube/resourcemanagement/support/client/Resource_support.java
@@ -8,7 +8,6 @@ public class Resource_support implements EntryPoint {
 	
 	public Resource_support() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
 	public Resource_support(HandlerManager eventBus){
diff --git a/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java b/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
index 76bb233..bb98fb2 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
+++ b/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
@@ -55,7 +55,9 @@ public final class CurrentStatus implements Serializable {
 		if (scope != null) {
 			currentScope = scope.trim();
 		}
-		Resource_support.get().getEventBus().fireEvent(new SetScopeEvent(scope));
+		if (Resource_support.get() != null) {
+			Resource_support.get().getEventBus().fireEvent(new SetScopeEvent(scope));
+		}
 		//Commands.setStatusScope(scope);
 	}