diff --git a/app/models/friends_block.rb b/app/models/friends_block.rb
index b4d81f3..03604dc 100644
--- a/app/models/friends_block.rb
+++ b/app/models/friends_block.rb
@@ -14,7 +14,7 @@ class FriendsBlock < ProfileListBlock
 
   def footer
     owner_id = owner.identifier
-    lambda do
+    proc do
       link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
     end
   end
diff --git a/app/models/person.rb b/app/models/person.rb
index 7795df7..28985f1 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -102,7 +102,10 @@ class Person < Profile
 
   def add_friend(friend, group = nil)
    unless self.is_a_friend?(friend)
-      self.friendships.build(:friend => friend, :group => group).save!
+      friendship = self.friendships.build
+      friendship.friend = friend
+      friendship.group = group
+      friendship.save
    end
   end
 
--
libgit2 0.21.2