diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ffdc3b73..5ca87edc 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -223,7 +223,7 @@ module Jekyll
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-          raise ArgumentError.new("Nil object array given. Sort cannot process an empty object array.")
+          raise ArgumentError.new("Sort: cannot sort a null object.")
       end
       if property.nil?
         input.sort
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 642a6114..be8ba373 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -284,7 +284,7 @@ class TestFilters < JekyllUnitTest
         err = assert_raises ArgumentError do
           @filter.sort(nil)
         end
-        assert_equal "Nil object array given. Sort cannot process an empty object array.", err.message
+        assert_equal "Sort: cannot sort a null object.", err.message
       end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])