diff --git a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
index 9e21b653..5845d102 100644
--- a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
+++ b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
@@ -61,20 +61,17 @@ public static MauiAppBuilder ConfigureAppServices(this MauiAppBuilder builder) {
             });
 
             builder.Services.AddSingleton<Func<String, String>>(serviceProvider => configSetting => {
-                                                                    IApplicationCache applicationCache = serviceProvider.GetService<IApplicationCache>();
-
-                                                                    if (applicationCache != null)
-                                                                        return configSetting switch {
-                                                                            "ConfigServiceUrl" => applicationCache.GetConfigHostUrl() ?? String.Empty,
-                                                                            "ApplicationUpdateServiceUrl" when String.IsNullOrWhiteSpace(applicationCache.GetConfiguration()?.ApplicationUpdateUri) == false => applicationCache.GetConfiguration().ApplicationUpdateUri,
-                                                                            "SecurityService" => applicationCache.GetConfiguration()?.SecurityServiceUri ?? String.Empty,
-                                                                            "TransactionProcessorACL" => applicationCache.GetConfiguration()?.TransactionProcessorAclUri ?? String.Empty,
-                                                                            "TransactionProcessorApi" => applicationCache.GetConfiguration()?.TransactionProcessorUri ?? String.Empty,
-                                                                            "EstateReportingApi" => applicationCache.GetConfiguration()?.EstateReportingUri ?? String.Empty,
-                                                                            _ => String.Empty
-                                                                        };
-
-                                                                    return null;
+                                                                     IApplicationCache applicationCache = serviceProvider.GetRequiredService<IApplicationCache>();
+
+                                                                     return configSetting switch {
+                                                                         "ConfigServiceUrl" => applicationCache.GetConfigHostUrl() ?? String.Empty,
+                                                                         "ApplicationUpdateServiceUrl" when String.IsNullOrWhiteSpace(applicationCache.GetConfiguration()?.ApplicationUpdateUri) == false => applicationCache.GetConfiguration().ApplicationUpdateUri,
+                                                                         "SecurityService" => applicationCache.GetConfiguration()?.SecurityServiceUri ?? String.Empty,
+                                                                         "TransactionProcessorACL" => applicationCache.GetConfiguration()?.TransactionProcessorAclUri ?? String.Empty,
+                                                                         "TransactionProcessorApi" => applicationCache.GetConfiguration()?.TransactionProcessorUri ?? String.Empty,
+                                                                         "EstateReportingApi" => applicationCache.GetConfiguration()?.EstateReportingUri ?? String.Empty,
+                                                                         _ => String.Empty
+                                                                     };
                                                                     });
 
             builder.Services.AddSingleton<IConfigurationService, ConfigurationService>();