diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 96dc54bc9..48468fb1e 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -9,7 +9,7 @@ class RegistrationsController < Devise::RegistrationsController
 
   def create
     begin 
-      user = User.instantiate(params[:user])
+      user = User.instantiate!(params[:user])
     rescue MongoMapper::DocumentNotValid => e
       user = nil
       flash[:error] = e.message
diff --git a/app/models/user.rb b/app/models/user.rb
index 625b54875..f71fdf428 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -286,7 +286,7 @@ class User
   end
 
   ###Helpers############
-  def self.instantiate( opts = {} )
+  def self.instantiate!( opts = {} )
     opts[:person][:diaspora_handle] = "#{opts[:username]}@#{opts[:url]}"
     opts[:person][:serialized_key] = generate_key
     User.create!(opts)