diff --git a/app/models/user.rb b/app/models/user.rb
index b6997839..7e63ebd5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -128,8 +128,11 @@ class User < ActiveRecord::Base
   end
 
   def feed
+    micropost_ids = []
     # Following posts
-    micropost_ids = self.following.map{|f| f.microposts.pluck(:id)}.flatten
+    if self.following.present?
+      micropost_ids << self.following.map{|f| begin; f.microposts.pluck(:id); rescue; end;}.flatten
+      end
     # Self posts
     micropost_ids << self.microposts.pluck(:id)
     # Flatten for SQL query