diff --git a/LANCommander.SDK/Client.cs b/LANCommander.SDK/Client.cs
index 3aa06651..6cfad48f 100644
--- a/LANCommander.SDK/Client.cs
+++ b/LANCommander.SDK/Client.cs
@@ -60,7 +60,12 @@ namespace LANCommander.SDK
 
         public Client(string baseUrl, string defaultInstallDirectory, ILogger logger)
         {
-            BaseUrl = new Uri(baseUrl);
+            if (!String.IsNullOrWhiteSpace(baseUrl))
+            {
+                BaseUrl = new Uri(baseUrl);
+                ApiClient = new RestClient(BaseUrl);
+            }
+
             DefaultInstallDirectory = defaultInstallDirectory;
 
             Games = new GameService(this, DefaultInstallDirectory, logger);
@@ -69,9 +74,6 @@ namespace LANCommander.SDK
             Actions = new ActionService(this);
             Profile = new ProfileService(this, logger);
 
-            if (!String.IsNullOrWhiteSpace(baseUrl))
-                ApiClient = new RestClient(BaseUrl);
-
             Logger = logger;
         }