diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index 5607698e7e1fefc95bd55af29fe130ea6185eb2c..caff1cb0b9c8c6b73f8e0fb3b1a8738a4ac7db6c 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -32,13 +32,15 @@ class InvitationsController < Devise::InvitationsController
 
   def update
     begin
-      puts "foobar"
-      puts params.inspect
+      invitation_token = params[:user][:invitation_token]
+      if invitation_token.nil? || invitation_token.blank?
+        raise "Invalid Invite Token"
+      end
       user = User.find_by_invitation_token(params[:user][:invitation_token])
       puts user.inspect
       user.seed_aspects
       user.accept_invitation!(params[:user])
-    rescue MongoMapper::DocumentNotValid => e
+    rescue Exception => e
       user = nil
       flash[:error] = e.message
     end
diff --git a/app/views/invitations/edit.html.haml b/app/views/invitations/edit.html.haml
index 3dd99446e8f9b805e8dcf2cb1a63ee2a94805aa8..30c04e0d048e54e00b3fc6f7d17c6472020985db 100644
--- a/app/views/invitations/edit.html.haml
+++ b/app/views/invitations/edit.html.haml
@@ -19,8 +19,8 @@
       %p
         = f.label :password_confirmation , t('password_confirmation')
         = f.password_field :password_confirmation, :title => t('registrations.new.enter_password_again') 
-        = f.hidden_field :invitation_token
 
       = f.submit t('registrations.new.sign_up')
+      %br
       = render :partial => "devise/shared/links"