diff --git a/hakyll.cabal b/hakyll.cabal
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -1,5 +1,5 @@
 Name:    hakyll
-Version: 4.9.0.0
+Version: 4.9.1.0
 
 Synopsis: A static website compiler library
 Description:
@@ -65,8 +65,13 @@
   tests/data/example.md
   tests/data/example.md.metadata
   tests/data/images/favicon.ico
+  tests/data/partial-helper.html
+  tests/data/partial.html
+  tests/data/partial.html.out
   tests/data/posts/2010-08-26-birthday.md
   tests/data/russian.md
+  tests/data/strip.html
+  tests/data/strip.html.out
   tests/data/template.html
   tests/data/template.html.out
 
@@ -159,7 +164,7 @@
     mtl                  >= 1      && < 2.3,
     network              >= 2.6    && < 2.7,
     network-uri          >= 2.6    && < 2.7,
-    pandoc               >= 1.14   && < 1.18,
+    pandoc               >= 1.14   && < 1.19,
     pandoc-citeproc      >= 0.4    && < 0.11,
     parsec               >= 3.0    && < 3.2,
     process              >= 1.0    && < 1.5,
@@ -174,8 +179,8 @@
     time-locale-compat   >= 0.1    && < 0.2,
     unordered-containers >= 0.2    && < 0.3,
     vector               >= 0.11   && < 0.12,
-    yaml                 >= 0.8    && < 0.9,
-    optparse-applicative >= 0.12   && < 0.13
+    yaml                 >= 0.8.11 && < 0.9,
+    optparse-applicative >= 0.12   && < 0.14
 
   If flag(previewServer)
     Build-depends:
@@ -202,7 +207,7 @@
 
   If flag(checkExternal)
     Build-depends:
-      http-conduit >= 2.1    && < 2.2,
+      http-conduit >= 2.2    && < 2.3,
       http-types   >= 0.7    && < 0.10
     Cpp-options:
       -DCHECK_EXTERNAL
@@ -232,7 +237,7 @@
     TestSuite.Util
 
   Build-Depends:
-    QuickCheck                 >= 2.8  && < 2.9,
+    QuickCheck                 >= 2.8  && < 2.10,
     tasty                      >= 0.11 && < 0.12,
     tasty-hunit                >= 0.9  && < 0.10,
     tasty-quickcheck           >= 0.8  && < 0.9,
@@ -252,7 +257,7 @@
     mtl                  >= 1      && < 2.3,
     network              >= 2.6    && < 2.7,
     network-uri          >= 2.6    && < 2.7,
-    pandoc               >= 1.14   && < 1.18,
+    pandoc               >= 1.14   && < 1.19,
     pandoc-citeproc      >= 0.4    && < 0.11,
     parsec               >= 3.0    && < 3.2,
     process              >= 1.0    && < 1.5,
@@ -268,7 +273,7 @@
     unordered-containers >= 0.2    && < 0.3,
     vector               >= 0.11   && < 0.12,
     yaml                 >= 0.8.11 && < 0.9,
-    optparse-applicative >= 0.12   && < 0.13
+    optparse-applicative >= 0.12   && < 0.14
 
   If flag(previewServer)
     Build-depends:
@@ -295,7 +300,7 @@
 
   If flag(checkExternal)
     Build-depends:
-      http-conduit >= 2.1    && < 2.2,
+      http-conduit >= 2.2    && < 2.3,
       http-types   >= 0.7    && < 0.10
     Cpp-options:
       -DCHECK_EXTERNAL
diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs
--- a/src/Hakyll/Check.hs
+++ b/src/Hakyll/Check.hs
@@ -236,8 +236,7 @@
 
     -- Convert exception to a concise form
     showException e = case cast e of
-        Just (Http.StatusCodeException (Http.Status code msg) _ _) ->
-            show code ++ " " ++ unpack msg
+        Just (Http.HttpExceptionRequest _ e') -> show e'
         _ -> head $ words $ show e
 #else
 checkExternalUrl _ = return ()
diff --git a/src/Hakyll/Main.hs b/src/Hakyll/Main.hs
--- a/src/Hakyll/Main.hs
+++ b/src/Hakyll/Main.hs
@@ -16,7 +16,8 @@
 
 
 --------------------------------------------------------------------------------
-import Options.Applicative
+import           Data.Monoid                     ((<>))
+import           Options.Applicative
 
 
 --------------------------------------------------------------------------------
diff --git a/tests/data/partial-helper.html b/tests/data/partial-helper.html
new file mode 100644
--- /dev/null
+++ b/tests/data/partial-helper.html
@@ -0,0 +1,3 @@
+<p>This is an included partial.</p>
+
+$body$
diff --git a/tests/data/partial.html b/tests/data/partial.html
new file mode 100644
--- /dev/null
+++ b/tests/data/partial.html
@@ -0,0 +1,3 @@
+<p>This is a file that includes a partial.</p>
+
+$partial("partial-helper.html")$
diff --git a/tests/data/partial.html.out b/tests/data/partial.html.out
new file mode 100644
--- /dev/null
+++ b/tests/data/partial.html.out
@@ -0,0 +1,7 @@
+<p>This is a file that includes a partial.</p>
+
+<p>This is an included partial.</p>
+
+This is an example.
+
+
diff --git a/tests/data/strip.html b/tests/data/strip.html
new file mode 100644
--- /dev/null
+++ b/tests/data/strip.html
@@ -0,0 +1,34 @@
+<div>
+    I'm so rich I have $$3.
+
+    $rev("foo")$
+    $-rev(rev("foo"))$
+
+    $if(body)-$
+    I have body
+    $else-$
+    or no
+    $-endif-$
+
+    $if(unbound)$
+    should not be printed
+    $endif$
+
+    $-if(body)-$
+    should be printed
+    $-endif$
+
+    <ul>
+    $for(authors)-$
+        <li>$name$</li>
+    $endfor-$
+    </ul>
+
+    $for(authors)-$
+        $name-$
+        $sep$,
+    $-endfor$
+
+    $body$
+</div>
+
diff --git a/tests/data/strip.html.out b/tests/data/strip.html.out
new file mode 100644
--- /dev/null
+++ b/tests/data/strip.html.out
@@ -0,0 +1,18 @@
+<div>
+    I'm so rich I have $3.
+
+    ooffoo
+
+    I have body
+    should be printed
+
+    <ul>
+    <li>Jan</li>
+    <li>Piet</li>
+    </ul>
+
+    Jan,Piet
+
+    <p>This is an example.</p>
+</div>
+