diff --git a/lib/liquid/context.rb b/lib/liquid/context.rb
index 8348150a..8e58b1de 100644
--- a/lib/liquid/context.rb
+++ b/lib/liquid/context.rb
@@ -93,7 +93,10 @@ module Liquid
 
 
     def handle_error(e, token=nil)
-      e = Liquid::Error.error_from_token(e, token) if token
+      if e.is_a?(Liquid::Error)
+        e.set_line_number_from_token(token)
+      end
+
       errors.push(e)
       raise if exception_handler && exception_handler.call(e)
       Liquid::Error.render(e)
diff --git a/lib/liquid/errors.rb b/lib/liquid/errors.rb
index 3aec4a15..cac3910d 100644
--- a/lib/liquid/errors.rb
+++ b/lib/liquid/errors.rb
@@ -20,11 +20,6 @@ module Liquid
       str
     end
 
-    def self.error_from_token(e, token)
-      e.set_line_number_from_token(token) if e.is_a?(Liquid::Error)
-      e
-    end
-
     def set_line_number_from_token(token)
       return unless token.respond_to?(:line_number)
       self.line_number = token.line_number