diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index a51894cc..b978ec7a 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -173,6 +173,7 @@ module Jekyll
     # Returns the sanitized path.
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
+      return base_directory if questionable_path.nil?
 
       clean_path = questionable_path.dup
       clean_path.insert(0, "/") if clean_path.start_with?("~")
diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index 546d2176..fd455945 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -38,6 +38,10 @@ class TestPathSanitization < JekyllUnitTest
                  Jekyll.sanitized_path(source_dir, "/#{subdir}/#{file_path}")
   end
 
+  should "handle nil questionable_path" do
+    assert_equal source_dir, Jekyll.sanitized_path(source_dir, nil)
+  end
+
   if Jekyll::Utils::Platforms.really_windows?
     context "on Windows with absolute path" do
       setup do