From c207150ae9cb9b9ef34f88a4903b5a9f31a9810d Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Sun, 24 May 2026 13:00:41 -0600
Subject: [PATCH] Fix achievement logic startup crash

---
 src/dusk/achievements.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dusk/achievements.cpp b/src/dusk/achievements.cpp
index d06ed404cc..6c4de43487 100644
--- a/src/dusk/achievements.cpp
+++ b/src/dusk/achievements.cpp
@@ -1161,7 +1161,7 @@ std::vector<AchievementSystem::Entry> AchievementSystem::makeEntries() {
                 false, 0, 0, false
             },
             [](Achievement& a, json&) {
-                if (dComIfGs_isEventBit(dSv_event_flag_c::M_018)) {
+                if (dComIfGs_isEventBit(dSv_event_flag_c::M_018) || dComIfGp_getStageStagInfo() == nullptr) {
                     return;
                 }
                 const bool savedPortal = g_dComIfG_gameInfo.info.getSavedata().getSave(dStage_SaveTbl_ELDIN).getBit().isSwitch(31);