Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 7 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
index eb3572728..3dbee402b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -64,10 +64,13 @@ namespace Tango.MachineStudio.UI.TFS
         {
             try
             {
-                IStudioApplicationManager app = TangoIOC.Default.GetInstance<IStudioApplicationManager>();
-                var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember());
-                items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("<div style=\"white-space:pre;\">", "").Replace("</div>", ""));
-                ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < Version.Parse(app.Version)).ToObservableCollection();
+                if (Project != null)
+                {
+                    IStudioApplicationManager app = TangoIOC.Default.GetInstance<IStudioApplicationManager>();
+                    var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember());
+                    items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("<div style=\"white-space:pre;\">", "").Replace("</div>", ""));
+                    ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < Version.Parse(app.Version)).ToObservableCollection();
+                }
             }
             catch (Exception ex)
             {