diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
index c2bfe6e..8147064 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
@@ -17,7 +17,6 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
 import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
 import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager;
-import org.gcube.portlets.user.td.gwtservice.shared.Constants;
 import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
 import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession;
@@ -76,10 +75,10 @@ public class SessionUtil {
 		ASLSession session;
 		if (username == null) {
 			logger.warn("no user found in session, using test one");
-			/* throw new TDGWTSessionExpiredException("Session Expired!"); */
+			throw new TDGWTSessionExpiredException("Session Expired!"); 
 
 			// Remove comment for Test
-
+			/*
 			username = Constants.DEFAULT_USER;
 			String scope = Constants.DEFAULT_SCOPE;
 
@@ -87,7 +86,7 @@ public class SessionUtil {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
 			session.setScope(scope);
-
+			*/
 		} else {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java
index 5bdc428..596e5d7 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java
@@ -119,13 +119,13 @@ public class OperationMonitorCreator {
 			ArrayList<ValidationsJobS> validationsJobS = new ArrayList<ValidationsJobS>();
 			int j = 1;
 			for (ValidationJob valJob : job.getValidationJobs()) {
-
 				ValidationsJobS validationJ = new ValidationsJobS(
 						String.valueOf(j), WorkerStateMap.map(valJob
 								.getStatus()), valJob.getProgress(),
 						valJob.getDescription(), valJob.getErrorMessage(),
 						valJob.getHumaReadableStatus());
 				validationsJobS.add(validationJ);
+				j++;
 			}
 
 			JobS jobS = new JobS(String.valueOf(i), job.getProgress(),
@@ -134,7 +134,7 @@ public class OperationMonitorCreator {
 					validationsJobS);
 
 			jobSList.add(jobS);
-			j++;
+			i++;
 
 		}