From 5e33d5f8695e591def22c2c45e6c2dbdda394edf Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 7 Aug 2023 22:12:47 +0100
Subject: [PATCH] .

---
 atlas/models.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/atlas/models.py b/atlas/models.py
index f4e67d67..7d7f1ac8 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -380,12 +380,13 @@ def extract_image_dicom_json_from_ds(ds, url):
     d = {}
 
     for key in to_keep:
-        val = ds[key].value
+        if key in ds:
+            val = ds[key].value
 
-        if type(val) == pydicom.multival.MultiValue:
-            d[key] = list(val)
-        else:
-            d[key] = val
+            if type(val) == pydicom.multival.MultiValue:
+                d[key] = list(val)
+            else:
+                d[key] = val
 
     return {"metadata": d, "url": f"dicomweb:{url}"}
 
@@ -411,7 +412,7 @@ class SeriesImage(SeriesImageBase):
         except FileNotFoundError:
             return []
         except InvalidDicomError:
-            return []
+            return {"url": f"dicomweb:{REMOTE_URL}{self.image.url}"}
 
 
 class SeriesFinding(models.Model):