diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index bcd13d0b..8d57f666 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -55,6 +55,10 @@ module Jekyll
       "verbose"           => false,
       "defaults"          => [],
 
+      "liquid"            => {
+        "error_mode" => "warn"
+      },
+
       "rdiscount"         => {
         "extensions" => []
       },
diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 30f798bc..9110cb13 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -5,6 +5,7 @@ module Jekyll
   class LiquidRenderer
     def initialize(site)
       @site = site
+      Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
       reset
     end