diff --git a/Application/FileConverter/Services/UpgradeService.cs b/Application/FileConverter/Services/UpgradeService.cs
index 1ff083dd..f42e2221 100644
--- a/Application/FileConverter/Services/UpgradeService.cs
+++ b/Application/FileConverter/Services/UpgradeService.cs
@@ -68,6 +68,11 @@ public async Task<UpgradeVersionDescription> CheckForUpgrade()
                 Diagnostics.Debug.Log($"Failed to check upgrade: {exception.Message}.");
             }
 
+            if (task == null)
+            {
+                return null;
+            }
+
             UpgradeVersionDescription versionDescription = await task;
 
             if (versionDescription == null)
@@ -155,7 +160,7 @@ public void CancelUpgrade()
         private async Task<UpgradeVersionDescription> DownloadLatestVersionDescription()
         {
 #if BUILD32
-            Uri uri = new Uri(Helpers.BaseURI + "version (x86).xml");
+            Uri uri = new Uri(UpgradeService.BaseURI + "version (x86).xml");
 #else
             Uri uri = new Uri(UpgradeService.BaseURI + "version.xml");
 #endif