diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7980de32c2..35b48d9924 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -369,6 +369,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client)
         {
+            if (client == null)
+                return false;
+
             UUID agentID = client.AgentId;
 
             // Check if the online friends list is needed