diff --git a/HISTORY.rst b/HISTORY.rst
index 2324bd711..7213129ce 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -73,6 +73,7 @@ Full Change List
 - Bugfix broken SV filter (#587).
 - Fixed bug where Exac and thousand genomes settings were not shown in frequency tab for GRCh37 (#597).
 - Form template reports error if genomebuild variable is not set (#607).
+- Making ``keyvalue`` more robust to failure (#613).
 
 ------
 v1.2.0
diff --git a/templatetags/templatetags/dict.py b/templatetags/templatetags/dict.py
index 4b9582279..0a2ea54d7 100644
--- a/templatetags/templatetags/dict.py
+++ b/templatetags/templatetags/dict.py
@@ -5,7 +5,9 @@
 
 @register.filter
 def keyvalue(data, key):
-    if hasattr(data, "get"):
+    if data is None:
+        return None
+    elif hasattr(data, "get"):
         return data.get(key)
     else:
         return data[key]