1 files changed, 8 insertions, 3 deletions

diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 0c40c56d..20c6c309 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -43,11 +43,11 @@ namespace WixToolset.Core
 
         private Dictionary<Type, object> Singletons { get; }
 
-        public object GetService(Type serviceType)
+        public bool TryGetService(Type serviceType, out object service)
         {
             if (serviceType == null) throw new ArgumentNullException(nameof(serviceType));
 
-            if (!this.Singletons.TryGetValue(serviceType, out var service))
+            if (!this.Singletons.TryGetValue(serviceType, out service))
             {
                 if (this.CreationFunctions.TryGetValue(serviceType, out var creationFunction))
                 {
@@ -62,7 +62,12 @@ namespace WixToolset.Core
                 }
             }
 
-            return service ?? throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
+            return service != null;
+        }
+
+        public object GetService(Type serviceType)
+        {
+            return this.TryGetService(serviceType, out var service) ? service : throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
         }
 
         public void AddService(Type serviceType, Func<IServiceProvider, Dictionary<Type, object>, object> creationFunction)