diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 70d38c2d..37906b25 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -206,10 +206,9 @@ module Precious
         contents = ::File.read(tempfile)
         reponame = "#{dir}/#{filename}.#{format}"
 
-        options = {
-            :message => "Uploaded file to #{dir}/#{reponame}",
-            :parent  => wiki.repo.head.commit,
-        }
+        options = { :message => "Uploaded file to #{dir}/#{reponame}" }
+        options[:parent] = wiki.repo.head.commit if wiki.repo.head
+
         author  = session['gollum.author']
         unless author.nil?
           options.merge! author