diff --git a/app/models/user.rb b/app/models/user.rb
index 48e2a05f2..0ec7ed50b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -150,19 +150,34 @@ class User
 
     post = build_post(class_name, options)
 
-    if post.persisted?
-      Rails.logger.info("Pushing: #{post.inspect} out to aspects")
-      push_to_aspects(post, aspect_ids)
-      post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
-      if options[:public] == true
-        self.services.each do |service|
-          self.send("post_to_#{service.provider}".to_sym, service, post.message)
-        end
-      end
+    if post.save
+      raise 'MongoMapper failed to catch a failed save' unless post.id
+      dispatch_post(post, :to => aspect_ids)
     end
     post
   end
 
+  def build_post(class_name, options = {})
+    options[:person] = self.person
+    options[:diaspora_handle] = self.person.diaspora_handle
+
+    model_class = class_name.to_s.camelize.constantize
+    model_class.instantiate(options)
+  end
+
+  def dispatch_post(post, opts = {})
+    self.raw_visible_posts << post
+    self.save
+    Rails.logger.info("Pushing: #{post.inspect} out to aspects")
+    push_to_aspects(post, opts[:to])
+    post.socket_to_uid(id, :aspect_ids => opts[:to]) if post.respond_to?(:socket_to_uid)
+    if post.public
+      self.services.each do |service|
+        self.send("post_to_#{service.provider}".to_sym, service, post.message)
+      end
+    end
+  end
+
   def post_to_facebook(service, message)
     Rails.logger.info("Sending a message: #{message} to Facebook")
     EventMachine::HttpRequest.new("https://graph.facebook.com/me/feed?message=#{message}&access_token=#{service.access_token}").post
@@ -203,20 +218,6 @@ class User
     aspect_ids
   end
 
-  def build_post(class_name, options = {})
-    options[:person] = self.person
-    options[:diaspora_handle] = self.person.diaspora_handle
-
-    model_class = class_name.to_s.camelize.constantize
-    post = model_class.instantiate(options)
-    if post.save
-      raise 'MongoMapper failed to catch a failed save' unless post.id
-      self.raw_visible_posts << post
-      self.save
-    end
-    post
-  end
-
   def push_to_aspects(post, aspect_ids)
     if aspect_ids == :all || aspect_ids == "all"
       aspects = self.aspects
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index e3917008a..2615ac82d 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -9,6 +9,7 @@ describe Diaspora::WebSocket do
     @user = make_user
     @aspect = @user.aspects.create(:name => "losers")
     @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
+    @post.save
   end
 
   it 'should queue a job' do
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index 734c187fc..79233cb4c 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -36,7 +36,19 @@ describe User do
     end
   end
 
-  describe '#post' do
+  describe '#build_post' do
+    it 'does not save a status_message' do
+      post = user.build_post(:status_message, :message => "hey", :to => aspect.id)
+      post.persisted?.should be_false
+    end
+
+    it 'does not save an album' do
+      post = user.build_post(:album, :name => "hey", :to => aspect.id)
+      post.persisted?.should be_false
+    end
+  end
+
+  describe '#dispatch_post' do
     it 'should put the post in the aspect post array' do
       post = user.post(:status_message, :message => "hey", :to => aspect.id)
       aspect.reload
@@ -67,7 +79,6 @@ describe User do
       user.should_receive(:post_to_facebook).exactly(0).times
       user.post :status_message, :message => "hi", :to => "all"
     end
-
   end
 
   describe '#update_post' do