diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 38205752c2..95192e3280 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -71,9 +71,24 @@ namespace OpenSim.Grid.UserServer
             theUser.currentAgent.currentHandle = SimInfo.regionHandle;
 
             System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
-            // Send
-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);
+            // Send
+            try
+            {
+                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
+                XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
+            }
+            catch( WebException e )
+            {
+                switch( e.Status )
+                {
+                    case WebExceptionStatus.Timeout:
+                        //TODO: Send him to nearby or default region instead
+                        break;
+                       
+                    default:
+                        throw;
+                }
+            }
         }
     }
 }