diff --git a/visual_studio/tools/sources/post_build_helper/post_build_helper/WpfApplication.cs b/visual_studio/tools/sources/post_build_helper/post_build_helper/WpfApplication.cs
index 2ef33572..06ca709e 100644
--- a/visual_studio/tools/sources/post_build_helper/post_build_helper/WpfApplication.cs
+++ b/visual_studio/tools/sources/post_build_helper/post_build_helper/WpfApplication.cs
@@ -1084,16 +1084,26 @@ where CgbUtils.NormalizePath(k) == CgbUtils.NormalizePath(fi.DirectoryName)
 
 			foreach (var w in watches)
 			{
-				var watchDir = new WatchedDirectoryVM(this, inst, w.Key);
-
-				foreach (var f in w.Value)
+				try 
 				{
-					watchDir.Files.Add(f);
-				}
+				    var watchDir = new WatchedDirectoryVM(this, inst, w.Key);
+
+				    foreach (var f in w.Value)
+				    {
+					    watchDir.Files.Add(f);
+				    }
 
-				// Start to watch:
-				inst.CurrentlyWatchedDirectories.Add(watchDir);
-				watchDir.NightGathersAndNowMyWatchBegins();
+				    // Start to watch:
+				    inst.CurrentlyWatchedDirectories.Add(watchDir);
+				    watchDir.NightGathersAndNowMyWatchBegins();
+				}
+				catch (Exception ex) 
+                {
+                    AddToMessagesList(Message.Create(MessageType.Error, $"Failed to establish FileSystemWatcher for {w.Key}", () =>
+                    {
+                        MessageBox.Show(ex.Message);
+                    }), inst);
+				}
 			}
 		}