1 files changed, 13 insertions, 0 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ee3d7c5..86c0ac8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -812,6 +812,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             // ok, client wants us to use an explicit UUID
                             // regardless of what the avatar name provided
                             userID = new UUID((string) requestData["estate_owner_uuid"]);
+                            
+                            // Check that the specified user exists
+                            Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene;
+                            IUserAccountService accountService = currentOrFirst.UserAccountService;
+                            UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID, userID);
+                            
+                            if (user == null)
+                                throw new Exception("Specified user was not found.");
                         }
                         else if (requestData.ContainsKey("estate_owner_first") & requestData.ContainsKey("estate_owner_last"))
                         {
@@ -823,6 +831,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             IUserAccountService accountService = currentOrFirst.UserAccountService;
                             UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID,
                                                                                ownerFirst, ownerLast);
+                            
+                            // Check that the specified user exists
+                            if (user == null)
+                                throw new Exception("Specified user was not found.");
+                            
                             userID = user.PrincipalID;
                         }
                         else