Handle a couple of edge cases

LBSD-2786
liveblog · May 3, 2024 · 9d55b69 · 9d55b69
1 parent df84153
commit 9d55b69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/app/scripts/liveblog-settings/controllers/instance-settings.ts b/client/app/scripts/liveblog-settings/controllers/instance-settings.ts
@@ -13,7 +13,7 @@ const LiveblogInstanceSettingsController = (
     $scope.settingsLoading = true;
 
     api.instance_settings.query().then((data) => {
-        $scope.instanceSettings.settings = JSON.stringify(data._items[0].settings);
+        $scope.instanceSettings.settings = JSON.stringify(data._items[0]?.settings ?? '{}');
 
         $scope.settingsLoading = false;
     });

diff --git a/server/liveblog/instance_settings/instance_settings.py b/server/liveblog/instance_settings/instance_settings.py
@@ -128,7 +128,7 @@ def get_existing_config(self):
         try:
             return self.get(req=None, lookup={})[0]
         except IndexError:
-            return None
+            return {}
 
 
 @instance_settings_blueprint.route("/api/instance_settings/current", methods=["GET"])