diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index f1a3c7f8cc..a90c3805f4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -307,8 +307,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             catch (System.ObjectDisposedException)
             {
                 m_log.Info("[UDPSERVER]: UDP Object disposed.   No need to worry about this if you're restarting the simulator.");
-            }
-            
+            }            
         }       
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 4a03ecd3c2..9efaf8172e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -671,6 +671,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                 {
                     // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send
                     UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
+                    
+                    if (null == data)
+                        break;
+                    
                     if (!data.AgentOnline)
                     {
                         m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);