--- a/ui/mainwindow.cpp	Mon Sep 01 15:05:48 2014 +0200
+++ b/ui/mainwindow.cpp	Mon Sep 01 16:18:10 2014 +0200
@@ -1109,20 +1109,17 @@
 }
 
 void MainWindow::installerSuccess() {
-    if (mCurState == NewListAvailable || mCurState == NewSoftwareAvailable) {
+    if (mCurState == NewListAvailable ) {
         mCurState = NothingChanged;
         mCurMessage = QString();
+    }
 
-        QString listFileName = mSettings.value("List/available").toString();
-        QDateTime listFileDate = mSettings.value("List/availableDate").toDateTime();
-
+    QString listFileName = mSettings.value("List/available").toString();
+    QDateTime listFileDate = mSettings.value("List/availableDate").toDateTime();
+    if (!listFileName.isEmpty() && listFileDate.isValid()) {
         mSettings.remove("List/available");
         mSettings.remove("List/availableDate");
 
-        if (listFileName.isEmpty() || !listFileDate.isValid()) {
-            qWarning() << "Error accessing settings";
-            return; /* Try again with next check */
-        }
         /* Rename the installed list to list-installed.txt so that external
          * programs (like the uninstaller can easily recognize it). */
         QString dataLoc =
@@ -1159,9 +1156,8 @@
             mSettings.remove("List/installed");
             mSettings.remove("List/installedDate");
         }
-        mListToInstall = CertificateList();
-
     }
+    mListToInstall = CertificateList();
     mUpdatesManual->clear();
     loadCertificateList();
 }