diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py
index 6737ebdfb9..a59f235741 100644
--- a/cura/PrintInformation.py
+++ b/cura/PrintInformation.py
@@ -345,8 +345,8 @@ class PrintInformation(QObject):
             except:
                 Logger.log("w", "Unsupported Mime Type Database file extension")
 
-            if data is not None:
-                self._base_name = data
+            if data is not None and check_name is not None:
+                self._base_name = check_name
             else:
                 self._base_name = ''
 
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index 81046b51ce..20206d919f 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -34,7 +34,7 @@ class Toolbox(QObject, Extension):
         self._plugin_registry = Application.getInstance().getPluginRegistry()
         self._packages_version = self._getPackagesVersion()
         self._api_version = 1
-        self._api_url = "https://api-staging.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version)
+        self._api_url = "https://api.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version)
 
         # Network:
         self._get_packages_request = None