diff --git a/app/models/upload.rb b/app/models/upload.rb
index f97fb0fa2..68b94f39d 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -25,7 +25,7 @@ class Upload < ActiveRecord::Base
       md5_post = Post.find_by_md5(md5)
       if md5_post
         merge_tags(md5_post) 
-        raise "duplicate: #{post.id}"
+        raise "duplicate: #{md5_post.id}"
       end
     end
     
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index b8c4b5441..e412d516c 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -9,6 +9,7 @@
     <%= render "image" %>
     <%= render "post", :post => @post %>
     <%= render "sources/info", :source => @source %>
+    
     <%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => 'form'}) do |f| %>
       <div class="input">
         <%= f.label :file %>