diff --git a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
index 6088da9..978c57b 100644
--- a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
+++ b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
@@ -64,10 +64,14 @@ public class SecretManager {
 		currentSecretHolder.set();
 	}
 
-	public synchronized void endSession() throws Exception {
+	public synchronized void endSession() {
 		if (currentSecretHolder != initialSecretHolder) {
 			currentSecretHolder.reset();
-			initialSecretHolder.set();
+			try {
+				initialSecretHolder.set();
+			}catch (Exception e) {
+				throw new RuntimeException(e);
+			}
 			currentSecretHolder = initialSecretHolder;
 		}
 	}