diff --git a/server/api/graphene_wagtail.py b/server/api/graphene_wagtail.py
index 79df0c83..25eb0122 100644
--- a/server/api/graphene_wagtail.py
+++ b/server/api/graphene_wagtail.py
@@ -88,18 +88,21 @@ def augment_fields(raw_data):
                 data['value'] = augment_fields(item_data)
 
             if _type == 'cms_document_block':
-                _value = data['value']
-                document = CustomDocument.objects.get(id=_value)
-                value = {
-                    'value': _value,
-                    'id': document.id,
-                    'file_name': document.filename,
-                    'file_extension': document.file_extension,
-                    'url': document.url,
-                    'title': document.title,
-                    'display_text': document.display_text
-                }
-                data['value'] = value
+                try:
+                    _value = data['value']
+                    document = CustomDocument.objects.get(id=_value)
+                    value = {
+                        'value': _value,
+                        'id': document.id,
+                        'file_name': document.filename,
+                        'file_extension': document.file_extension,
+                        'url': document.url,
+                        'title': document.title,
+                        'display_text': document.display_text
+                    }
+                    data['value'] = value
+                except CustomDocument.DoesNotExist:
+                    logger.error('CustomDocument {} does not exist'.format(_value))
 
     return raw_data