diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 597b3c70d9..b023e586d8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,6 +20,7 @@ Changelog
  * Fix: `TableBlock` options `afterChange`, `afterCreateCol`, `afterCreateRow`, `afterRemoveCol`, `afterRemoveRow` and `contextMenu` can now be overridden (Loic Teixeira)
  * Fix: The lastmod field returned by wagtailsitemaps now shows the last published date rather than the date of the last draft edit (Matt Westcott)
  * Fix: Document chooser upload form no longer renders container elements for hidden fields (Jeffrey Chau)
+ * Fix: Prevented exception when visiting a preview URL without initiating the preview (Paul Kamp)
 
 
 1.10.1 (19.05.2017)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 0a9c80cdbf..981bc27a90 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -243,6 +243,7 @@ Contributors
 * Marc Tudurí
 * Lucas Moeskops
 * Rob van der Linde
+* Paul Kamp
 
 Translators
 ===========
diff --git a/docs/releases/1.11.rst b/docs/releases/1.11.rst
index 2d8219d851..f431d5259b 100644
--- a/docs/releases/1.11.rst
+++ b/docs/releases/1.11.rst
@@ -69,6 +69,7 @@ Bug fixes
  * ``TableBlock`` options ``afterChange``, ``afterCreateCol``, ``afterCreateRow``, ``afterRemoveCol``, ``afterRemoveRow`` and ``contextMenu`` can now be overridden (Loic Teixeira)
  * The lastmod field returned by wagtailsitemaps now shows the last published date rather than the date of the last draft edit (Matt Westcott)
  * Document chooser upload form no longer renders container elements for hidden fields (Jeffrey Chau)
+ * Prevented exception when visiting a preview URL without initiating the preview (Paul Kamp)
 
 
 Upgrade considerations