From cb1a2d1818770ca5088818a73860198b8ccca27a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 30 Jun 2013 16:38:35 +0200
Subject: [PATCH] Catch conversion errors. Constituent of #1105.

---
 lib/jekyll/convertible.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 7979aec2..b247ac4e 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -48,6 +48,10 @@ module Jekyll
     # Returns nothing.
     def transform
       self.content = converter.convert(self.content)
+    rescue => e
+      Jekyll.logger.error "Conversion error:", "There was an error converting" +
+        " '#{self.path}'."
+      raise e
     end
 
     # Determine the extension depending on content_type.