diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28ee480..18f2501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-# v1.x.x
-## xx/xx/2016
+# v1.5.1
+## 07/xx/2016
 
 1. [](#improved)
     * Added chinese and german translations
+1. [](#bugfix)
+    * Fixed issue with the Smartypants plugin running before Twig was processed
 
 # v1.5.0
 ## 07/14/2015
diff --git a/pages/error.md b/pages/error.md
index 0c41271..f80c188 100644
--- a/pages/error.md
+++ b/pages/error.md
@@ -4,6 +4,7 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+twig_first: true
 process:
 	twig: true
 ---