diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py
index fc197a150f8..0dc12bb4313 100644
--- a/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py
+++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py
@@ -80,6 +80,9 @@ def on_page_enter(self) -> None:
 
     def display_config(self, event):
 
+        if not self.working_container.all_data:
+            return
+
         project_data = self.working_container.all_data[self.working_container.selectes]
         project_name = project_data['details']['projectMetadata']['projectName']
         fdata = SimpleNamespace()
diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py
index f67391a14fe..8efdcd37aaf 100644
--- a/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py
+++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py
@@ -13,7 +13,7 @@
 
 from cli import config_cli
 from utils.multi_lang import _
-from utils.utils import DialogUtils
+from utils.utils import DialogUtils, fromisoformat
 from utils.static import cli_style, common_strings
 from wui_components.jans_vetrical_nav import JansVerticalNav
 from wui_components.jans_cli_dialog import JansGDialog
@@ -121,7 +121,7 @@ def save_ssa(self, dialog):
             new_data['expiration'] = int(datetime.now().timestamp()) + 1576800000
         else:
             if self.expire_widget.value:
-                new_data['expiration'] = int(datetime.fromisoformat(self.expire_widget.value).timestamp())
+                new_data['expiration'] = int(fromisoformat(self.expire_widget.value).timestamp())
 
         new_data['software_roles'] = new_data['software_roles'].splitlines()
 
diff --git a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py
index 85fc66b36b3..82ba88d5e6e 100644
--- a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py
+++ b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py
@@ -1,5 +1,7 @@
-from typing import Optional, Sequence, Callable
 import asyncio
+import json
+
+from typing import Optional, Sequence, Callable
 from functools import partial
 
 from prompt_toolkit import HTML
@@ -301,7 +303,7 @@ def save_user(self) -> None:
             multi_valued = False
             key_prop = self.get_claim_properties(key_)
 
-            if key_prop.get('dataType') == 'json':
+            if key_prop.get('dataType') == 'json' and raw_data[key_]:
                 try:
                     json.loads(raw_data[key_])
                 except Exception as e: