diff --git a/wwwroot/api/get_organizations.dspy b/wwwroot/api/get_organizations.dspy
index 71e88ee..cc315ce 100644
--- a/wwwroot/api/get_organizations.dspy
+++ b/wwwroot/api/get_organizations.dspy
@@ -1,19 +1,12 @@
-#!/usr/bin/env python3
-import json
-
 result = []
 
-try:
-    async with get_sor_context(request._run_ns, 'rbac') as sor:
-        user_orgid = await get_userorgid()
-        orgs = await sor.R('organization', {'id': user_orgid})
-        # Get current org and its children
-        all_orgs = await sor.sqlExe(
-            "select id, orgname from organization where id = ${id}$ or parentid = ${id}$ order by orgname",
-            {'id': user_orgid}
-        )
-        result = [{'value': r['id'], 'text': r['orgname']} for r in (all_orgs or [])]
-except Exception as e:
-    pass
+async with get_sor_context(request._run_ns, 'rbac') as sor:
+	user_orgid = await get_userorgid()
+	all_orgs = await sor.sqlExe(
+		"select id, orgname from organization where id = ${id}$ or parentid = ${id}$ order by orgname",
+		{'id': user_orgid}
+	)
+	if all_orgs:
+		result = [{'value': r.id, 'text': r.orgname} for r in all_orgs]
 
 return json.dumps(result, ensure_ascii=False, default=str)
diff --git a/wwwroot/api/get_upapps.dspy b/wwwroot/api/get_upapps.dspy
index b75a098..9f35973 100644
--- a/wwwroot/api/get_upapps.dspy
+++ b/wwwroot/api/get_upapps.dspy
@@ -1,17 +1,12 @@
-#!/usr/bin/env python3
-import json
-
 result = []
 
-try:
-    async with get_sor_context(request._run_ns, 'uapi') as sor:
-        user_orgid = await get_userorgid()
-        apps = await sor.sqlExe(
-            "select id, name from upapp where ownerid = ${ownerid}$ or ownerid is null order by name",
-            {'ownerid': user_orgid}
-        )
-        result = [{'value': r['id'], 'text': r['name']} for r in (apps or [])]
-except Exception as e:
-    pass
+async with get_sor_context(request._run_ns, 'uapi') as sor:
+	user_orgid = await get_userorgid()
+	apps = await sor.sqlExe(
+		"select id, name from upapp where ownerid = ${ownerid}$ or ownerid is null order by name",
+		{'ownerid': user_orgid}
+	)
+	if apps:
+		result = [{'value': r.id, 'text': r.name} for r in apps]
 
 return json.dumps(result, ensure_ascii=False, default=str)