Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index 7926efb..c2ad9db 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -105,10 +105,14 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat("[AUTHORIZATION CONNECTOR]: Unable to send authorize {0} for region {1} error thrown during comms with remote server. Reason: {2}", userID, regionID, e.Message);
-                message="";
+                message = "";
+                return m_ResponseOnFailure;
+            }
+            if (response == null)
+            {
+                message = "Null response";
                 return m_ResponseOnFailure;
             }
-            
             m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message);
             message = response.Message;