diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
index a12ceb4..551ffd2 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
@@ -31,7 +31,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
index ad305fc..f8cc1e0 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
@@ -40,7 +40,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
index 92add71..257617a 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
@@ -38,7 +38,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
index 4c44d8f..f5d6433 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
@@ -47,7 +47,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
index e6e2892..c97cd1d 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
@@ -44,7 +44,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
         public async Task HandleAsync(HttpListenerContext context, string path)
         {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
index 649f4cb..3c969d4 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
@@ -34,7 +34,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.Equals(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.Equals(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
index d6e1930..1888242 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
@@ -35,7 +35,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
index 3338e3d..a94cfa9 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
@@ -29,7 +29,7 @@ namespace WelsonJS.Launcher.ResourceTools
 
         public bool CanHandle(HttpListenerContext context, string path)
         {
-            return path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
+            return path != null && path.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task HandleAsync(HttpListenerContext context, string path)
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
index ef6ae6d..ea66baa 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
@@ -31,7 +31,7 @@ namespace WelsonJS.Launcher
         private bool _isRunning;
         private string _prefix;
         private string _resourceName;
-        private List<IApiEndpoint> _apis = new List<IApiEndpoint>();
+        private readonly List<IApiEndpoint> _apis = new List<IApiEndpoint>();
         private BlobConfig _blobConfig;
         private readonly ILog _logger;
 
@@ -151,7 +151,7 @@ namespace WelsonJS.Launcher
                 return;
             }
 
-            // Serve from a resource tool
+            // Serve via API endpoints
             foreach (var api in _apis)
             {
                 if (api.CanHandle(context, path))