diff --git a/source/main.cpp b/source/main.cpp
index 7582249..47bd659 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -272,7 +272,7 @@ std::string EnvironmentSelectionScreen(const std::map<std::string, std::string>
 
     auto *screenBuffer = (uint8_t *) memalign(0x100, tvBufferSize + drcBufferSize);
     if (!screenBuffer) {
-        OSFatal("Fail to allocate screenBuffer");
+        OSFatal("EnvironmentLoader: Fail to allocate screenBuffer");
     }
     memset(screenBuffer, 0, tvBufferSize + drcBufferSize);
 
@@ -285,7 +285,7 @@ std::string EnvironmentSelectionScreen(const std::map<std::string, std::string>
     DrawUtils::initBuffers(screenBuffer, tvBufferSize, screenBuffer + tvBufferSize, drcBufferSize);
 
     if (!DrawUtils::initFont()) {
-        OSFatal("Failed to init font");
+        OSFatal("EnvironmentLoader: Failed to init font");
     }
 
     uint32_t selected = autobootIndex > 0 ? autobootIndex : 0;
diff --git a/source/module/ImportRPLInformation.h b/source/module/ImportRPLInformation.h
index 1188d76..1df6661 100644
--- a/source/module/ImportRPLInformation.h
+++ b/source/module/ImportRPLInformation.h
@@ -39,7 +39,7 @@ public:
 
     [[nodiscard]] const char *getRPLName() const {
         if (name.max_size() < strlen("._import_") + 1) {
-            OSFatal("Invalid RPLName, is too short to be valid");
+            OSFatal("EnvironmentLoader: Invalid RPLName, is too short to be valid");
         }
         return name.c_str() + strlen("._import_");
     }
diff --git a/source/module/ModuleDataFactory.cpp b/source/module/ModuleDataFactory.cpp
index 948991b..c2e8019 100644
--- a/source/module/ModuleDataFactory.cpp
+++ b/source/module/ModuleDataFactory.cpp
@@ -232,7 +232,7 @@ bool ModuleDataFactory::getImportRelocationData(std::unique_ptr<ModuleData> &mod
                 uint32_t section_index = psec->get_info();
                 if (!infoMap.contains(sym_section_index)) {
                     DEBUG_FUNCTION_LINE_ERR("Relocation is referencing a unknown section. %d destination: %08X sym_name %s", section_index, destinations[section_index], sym_name.c_str());
-                    OSFatal("Relocation is referencing a unknown section.");
+                    OSFatal("EnvironmentLoader: Relocation is referencing a unknown section.");
                 }
 
                 auto relocationData = make_unique_nothrow<RelocationData>(type,
diff --git a/source/utils/PairUtils.cpp b/source/utils/PairUtils.cpp
index 5741c79..688b32f 100644
--- a/source/utils/PairUtils.cpp
+++ b/source/utils/PairUtils.cpp
@@ -105,7 +105,7 @@ PairMenu::PairMenu() {
     mIMHandle = IM_Open();
     if (mIMHandle < 0) {
         DEBUG_FUNCTION_LINE_ERR("PairMenu: IM_Open failed");
-        OSFatal("PairMenu: IM_Open failed");
+        OSFatal("EnvironmentLoader: PairMenu: IM_Open failed");
     }
     mIMRequest = (IMRequest *) memalign(0x40, sizeof(IMRequest));
 
@@ -114,7 +114,7 @@ PairMenu::PairMenu() {
 
     if (!mIMRequest || !mIMCancelRequest) {
         DEBUG_FUNCTION_LINE_ERR("Failed to allocate im request");
-        OSFatal("PairMenu: Failed to allocate im request");
+        OSFatal("EnvironmentLoader: PairMenu: Failed to allocate im request");
     }
 
     mIMEventMask = IM_EVENT_SYNC;