diff --git a/backend/src/Designer/Controllers/OptionsController.cs b/backend/src/Designer/Controllers/OptionsController.cs
index cf1d2d45aaa..e5e293f9205 100644
--- a/backend/src/Designer/Controllers/OptionsController.cs
+++ b/backend/src/Designer/Controllers/OptionsController.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading;
@@ -149,7 +150,7 @@ public async Task<IActionResult> UploadFile(string org, string repo, [FromForm]
             List<Option> newOptionsList = await _optionsService.UploadNewOption(org, repo, developer, fileName, file, cancellationToken);
             return Ok(newOptionsList);
         }
-        catch (JsonException e)
+        catch (Exception e)
         {
             return BadRequest(e.Message);
         }
diff --git a/backend/src/Designer/Services/Implementation/OptionsService.cs b/backend/src/Designer/Services/Implementation/OptionsService.cs
index 978d473f9fd..835a7ba71d1 100644
--- a/backend/src/Designer/Services/Implementation/OptionsService.cs
+++ b/backend/src/Designer/Services/Implementation/OptionsService.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading;
@@ -72,6 +73,14 @@ public async Task<List<Option>> UploadNewOption(string org, string repo, string
         List<Option> deserializedOptions = JsonSerializer.Deserialize<List<Option>>(payload.OpenReadStream(),
             new JsonSerializerOptions { WriteIndented = true, AllowTrailingCommas = true });
 
+        foreach (Option option in deserializedOptions)
+        {
+            if (string.IsNullOrEmpty(option.Value) || string.IsNullOrEmpty(option.Label))
+            {
+                throw new Exception("Uploaded file is missing one of the following attributes for a option: value or label.");
+            }
+        }
+
         var altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, repo, developer);
         await altinnAppGitRepository.CreateOrOverwriteOptionsList(optionsListId, deserializedOptions, cancellationToken);
 
diff --git a/frontend/packages/shared/src/mocks/queriesMock.ts b/frontend/packages/shared/src/mocks/queriesMock.ts
index 87a909c7c61..03f83e9c251 100644
--- a/frontend/packages/shared/src/mocks/queriesMock.ts
+++ b/frontend/packages/shared/src/mocks/queriesMock.ts
@@ -212,7 +212,7 @@ export const queriesMock: ServicesContextProps = {
   updateAppMetadata: jest.fn().mockImplementation(() => Promise.resolve()),
   updateAppConfig: jest.fn().mockImplementation(() => Promise.resolve()),
   uploadDataModel: jest.fn().mockImplementation(() => Promise.resolve<JsonSchema>({})),
-  uploadOption: jest.fn().mockImplementation(() => Promise.resolve()),
+  uploadOptionList: jest.fn().mockImplementation(() => Promise.resolve()),
   upsertTextResources: jest
     .fn()
     .mockImplementation(() => Promise.resolve<ITextResourcesObjectFormat>({})),
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/EditCodeList/EditCodeList.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/EditCodeList/EditCodeList.tsx
index 68adc48ed4a..809023b99d6 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/EditCodeList/EditCodeList.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/EditCodeList/EditCodeList.tsx
@@ -78,7 +78,7 @@ export function EditCodeList<T extends SelectionComponentType>({
         <ErrorMessage>
           {error instanceof Error ? error.message : t('ux_editor.modal_properties_error_message')}
         </ErrorMessage>
-      ) : (
+      ) : optionListIds?.length !== 0 ? (
         <FormField
           key={component.id}
           id={component.id}
@@ -102,6 +102,8 @@ export function EditCodeList<T extends SelectionComponentType>({
             </StudioNativeSelect>
           )}
         />
+      ) : (
+        <> </>
       )}
       <StudioFileUploader
         className={classes.studioFileUploader}