diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 93f81c1b33a..ca984b01f41 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -339,11 +339,11 @@ PersistentSettingsReader::PersistentSettingsReader()
 {
 }
 
-QVariant PersistentSettingsReader::restoreValue(const QString &variable) const
+QVariant PersistentSettingsReader::restoreValue(const QString &variable, const QVariant &defaultValue) const
 {
     if (m_valueMap.contains(variable))
         return m_valueMap.value(variable);
-    return QVariant();
+    return defaultValue;
 }
 
 QVariantMap PersistentSettingsReader::restoreValues() const
diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h
index b27188dfbd9..c171d39e78a 100644
--- a/src/libs/utils/persistentsettings.h
+++ b/src/libs/utils/persistentsettings.h
@@ -45,7 +45,7 @@ class QTCREATOR_UTILS_EXPORT PersistentSettingsReader
 {
 public:
     PersistentSettingsReader();
-    QVariant restoreValue(const QString &variable) const;
+    QVariant restoreValue(const QString &variable, const QVariant &defaultValue = QVariant()) const;
     QVariantMap restoreValues() const;
     bool load(const FileName &fileName);
 
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 909a13c5b97..cd54354a92e 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -224,15 +224,13 @@ void AndroidConfig::load(const QSettings &settings)
     if (reader.load(FileName::fromString(sdkSettingsFileName()))
             && settings.value(changeTimeStamp).toInt() != QFileInfo(sdkSettingsFileName()).lastModified().toMSecsSinceEpoch() / 1000) {
         // persisten settings
-        m_sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey).toString());
-        m_ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey).toString());
-        m_antLocation = FileName::fromString(reader.restoreValue(AntLocationKey).toString());
-        m_openJDKLocation = FileName::fromString(reader.restoreValue(OpenJDKLocationKey).toString());
-        m_keystoreLocation = FileName::fromString(reader.restoreValue(KeystoreLocationKey).toString());
-        m_toolchainHost = reader.restoreValue(ToolchainHostKey).toString();
-        QVariant v = reader.restoreValue(AutomaticKitCreationKey);
-        if (v.isValid())
-            m_automaticKitCreation = v.toBool();
+        m_sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey, m_sdkLocation.toString()).toString());
+        m_ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey, m_ndkLocation.toString()).toString());
+        m_antLocation = FileName::fromString(reader.restoreValue(AntLocationKey, m_antLocation.toString()).toString());
+        m_openJDKLocation = FileName::fromString(reader.restoreValue(OpenJDKLocationKey, m_openJDKLocation.toString()).toString());
+        m_keystoreLocation = FileName::fromString(reader.restoreValue(KeystoreLocationKey, m_keystoreLocation.toString()).toString());
+        m_toolchainHost = reader.restoreValue(ToolchainHostKey, m_toolchainHost).toString();
+        m_automaticKitCreation = reader.restoreValue(AutomaticKitCreationKey, m_automaticKitCreation).toBool();
         QString extraDirectory = reader.restoreValue(MakeExtraSearchDirectory).toString();
         m_makeExtraSearchDirectories.clear();
         if (!extraDirectory.isEmpty())