1 files changed, 15 insertions, 14 deletions
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index f2e3f670..53ac3703 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -131,8 +131,9 @@
 {% endif %}
 
 {% if entity.state == 'active' %}
+
+{% if entity.files != [] and entity.files != None %}
 <h3>Archived Files and Locations</h3>
-{% if entity.files != [] %}
 <table class="ui compact fixed table">
   <tbody>
   {% for file in entity.files %}
@@ -151,15 +152,9 @@
   {% endfor %}
   </tbody>
 </table>
-{% else %}
-<p>There are no accessible files associated with this release. You could check
-<a href="/work/{{ release.work_id }}">other releases for this work</a> for an
-accessible version.
-{% endif %}
 {% endif %}
 
-{% if entity.state == 'active' %}
-{% if entity.filesets != [] %}
+{% if entity.filesets != [] and entity.filesets != None %}
 <h3>File Sets</h3>
 <table class="ui compact fixed table">
   <tbody>
@@ -181,10 +176,8 @@ accessible version.
   </tbody>
 </table>
 {% endif %}
-{% endif %}
 
-{% if entity.state == 'active' %}
-{% if entity.webcaptures != [] %}
+{% if entity.webcaptures != [] and entity.webcaptures != None %}
 <h3>Web Captures</h3>
 <table class="ui single line compact fixed table">
   <tbody>
@@ -203,9 +196,17 @@ accessible version.
   </tbody>
 </table>
 {% endif %}
+
+{% if not (entity.files or entity.filesets or entity.webcaptures) %}
+<h3>Archived Content</h3>
+<p>There are no accessible files associated with this release. You could check
+<a href="/work/{{ release.work_id }}">other releases for this work</a> for an
+accessible version.
+{% endif %}
+
 {% endif %}
-</div>
 
+</div>
 
 <div class="column" style="flex: 0 0 24em;">
 
@@ -213,7 +214,7 @@ accessible version.
   <a href="{{ entity._es.ia_pdf_url }}" class="ui fluid huge black button" style="text-decoration: underline;">
     <i class="file pdf outline icon"></i>Read Archived PDF
   </a>
-{% elif entity.state == 'active' and entity.webcaptures != [] and entity.webcaptures[0].archive_urls != [] and entity.webcaptures[0].archive_urls[0].rel == "wayback" %}
+{% elif entity.state == 'active' and entity.webcaptures != None and entity.webcaptures != [] and entity.webcaptures[0].archive_urls != [] and entity.webcaptures[0].archive_urls[0].rel == "wayback" %}
   <a href="{{ entity.webcaptures[0].archive_urls[0].url }}{{ entity.webcaptures[0]._wayback_suffix }}" class="ui fluid huge black button" style="text-decoration: underline;">
     <i class="university icon"></i>Visit Web Archive
   </a>
@@ -354,7 +355,7 @@ accessible version.
     #}
   {% endif %}
   {% if release.container._es.any_kbart == True %}
-    <i class="icon check green"></i> In <a href="https://keepers.issn.org/?q=api/search&search[]=MUST=allissn={{ release.container.issnl }}&search[]=MUST_EXIST=keepers">Keepers Registery</a><br>
+    <i class="icon check green"></i> In <a href="https://keepers.issn.org/?q=api/search&search[]=MUST=allissn={{ release.container.issnl }}&search[]=MUST_EXIST=keepers">Keepers Registry</a><br>
   {% elif release.container._es.any_kbart == False %} <i class="icon times grey"></i> Not in <a href="https://keepers.issn.org/?q=api/search&search[]=MUST=allissn={{ release.container.issnl }}&search[]=MUST_EXIST=keepers">Keepers Registry</a><br>
   {% endif %}
 {% endif %}