1 files changed, 15 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index 2f001b281..5cc95c617 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -97,6 +97,12 @@ namespace Tango.MachineStudio.UpdateService
                 {
                     db.Configuration.LazyLoadingEnabled = false;
 
+                    //Load relation first...
+                    db.Roles.ToList();
+                    db.Permissions.ToList();
+                    db.UsersRoles.ToList();
+                    db.RolesPermissions.ToList();
+
                     var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
                     if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion))
@@ -185,9 +191,16 @@ namespace Tango.MachineStudio.UpdateService
 
         public string GetLatestVersion()
         {
-            using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+            try
             {
-                return db.MachineStudioVersions.FirstOrDefault().Version;
+                using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                {
+                    return db.MachineStudioVersions.FirstOrDefault().Version;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new FaultException(ex.ToString());
             }
         }
     }