diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 675409b4..081d42c4 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -1097,6 +1097,7 @@ class ExportsView(View):
 
         a, b = self.get_server_erasure_hosts(erasures)
         erasures_host, erasures_on_server = a, b
+        erasures_host = set(erasures_host)
 
         result = 'Success'
         if "Failed" in [e.severity.get_public_name() for e in erasures]:
@@ -1104,7 +1105,7 @@ class ExportsView(View):
 
         erasures = sorted(erasures, key=lambda x: x.end_time)
         erasures_on_server = sorted(erasures_on_server, key=lambda x: x.end_time)
-        erasures_host = sorted(erasures_host, key=lambda x: x.end_time)
+        # import pdb; pdb.set_trace()
         erasures_normal = list(set(erasures) - set(erasures_on_server))
         erasures_normal = sorted(erasures_normal, key=lambda x: x.end_time)
 
diff --git a/ereuse_devicehub/templates/inventory/erasure.html b/ereuse_devicehub/templates/inventory/erasure.html
index 76df0694..c6b40d12 100644
--- a/ereuse_devicehub/templates/inventory/erasure.html
+++ b/ereuse_devicehub/templates/inventory/erasure.html
@@ -366,12 +366,14 @@
   <dd>Hid: {{ erasure.parent.hid }}</dd>
   <dd>Tags: {{ erasure.parent.tags }}</dd>
 
+  {% if erasure.device.parent %}
   <dt>Computer where it resides:</dt>
   <dd>Title: {{ erasure.device.parent.__format__('ts') }}</dd>
   <dd>DevicehubID: {{ erasure.device.parent.dhid }}</dd>
   <dd>Hid: {{ erasure.device.parent.hid }}</dd>
   <dd>Tags: {{ erasure.device.parent.tags }}</dd>
-    {% endif %}
+  {% endif %}
+  {% endif %}
 
   <dt>Erasure:</dt>
   <dd>{{ erasure.__format__('ts') }}</dd>