End of day commit

app/models/user.rb

@@ -63,6 +63,7 @@ class User
   end
 
   def avatar
+    return '' unless provider.present?
     case provider.to_sym
     when :facebook then "http://graph.facebook.com/#{uid}/picture?type=square"
     when :instagram then auth_data['info'].try(:[], 'image')
@@ -85,7 +86,7 @@ class User
 
   # This is the user name as it is shown to other users
   def friends_name
-    auth_data['info']['nickname'] rescue ''
+    auth_data['info']['nickname'] rescue name.to_s
   end
 
   def has_active_list?