diff --git a/launcher/src/profile.cpp b/launcher/src/profile.cpp
index 6ad8ff6..297e5a2 100644
--- a/launcher/src/profile.cpp
+++ b/launcher/src/profile.cpp
@@ -288,6 +288,9 @@ QString Profile::bootVersion() const
 QString Profile::baseGameVersion() const
 {
     Q_ASSERT(m_repositories.repositories_count >= 1);
+    if (m_repositories.repositories_count == 0 || m_repositories.repositories[0].version == nullptr) {
+        return QStringLiteral("2012.01.01.0000.0000");
+    }
     return QString::fromLatin1(m_repositories.repositories[0].version);
 }
 
diff --git a/launcher/ui/Pages/StatusPage.qml b/launcher/ui/Pages/StatusPage.qml
index b1e8b90..56efedc 100644
--- a/launcher/ui/Pages/StatusPage.qml
+++ b/launcher/ui/Pages/StatusPage.qml
@@ -56,13 +56,16 @@ Kirigami.Page {
     }
 
     Kirigami.PromptDialog {
-        id: updateRequiredDialog
+        id: updateDialog
 
         showCloseButton: false
         standardButtons: Kirigami.Dialog.Yes | Kirigami.Dialog.Cancel
 
         onAccepted: LauncherCore.updateDecided(true)
-        onRejected: LauncherCore.updateDecided(false)
+        onRejected: {
+            LauncherCore.updateDecided(false);
+            applicationWindow().checkSetup();
+        }
     }
 
     Connections {