1 files changed, 11 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 58dfc17c2..70378a4d5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -804,7 +804,17 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         private void ReportIssue()
         {
-            var bug = TFSClient.CreateBug();
+            Tango.TFS.WorkItem bug = null;
+
+            try
+            {
+                bug = TFSClient.CreateBug();
+            }
+            catch (Exception ex)
+            {
+                _notificationProvider.ShowError(ex.Message);
+                return;
+            }
 
             _notificationProvider.ShowModalDialog<ReportIssueViewVM, ReportIssueView>(new ReportIssueViewVM(TFSClient.Project, bug), async (vm) =>
              {