diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 01ed0743..723b0da7 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -87,7 +87,7 @@ module Jekyll
     def render_liquid(content, payload, info, path = nil)
       Liquid::Template.parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}"
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
       raise e
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 15f99507..ee1636c7 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -96,14 +96,16 @@ eos
         path = File.join(dir, file)
         validate_file(path, context.registers[:site].safe)
 
-        partial = Liquid::Template.parse(source(path, context))
+        begin
+          partial = Liquid::Template.parse(source(path, context))
 
-        context.stack do
-          context['include'] = parse_params(context) if @params
-          partial.render!(context)
+          context.stack do
+            context['include'] = parse_params(context) if @params
+            partial.render!(context)
+          end
+        rescue => e
+          raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
         end
-      rescue => e
-        raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
       end
 
       def validate_dir(dir, safe)