diff --git a/nx/include/switch/result.h b/nx/include/switch/result.h
index 07e82e99..a791ab1e 100644
--- a/nx/include/switch/result.h
+++ b/nx/include/switch/result.h
@@ -23,7 +23,8 @@ enum {
     LIBNX_BADRELOC=1,
     LIBNX_OUTOFMEM,
     LIBNX_ALREADYMAPPED,
-    LIBNX_BADGETINFO,
+    LIBNX_BADGETINFO_STACK,
+    LIBNX_BADGETINFO_HEAP,
     LIBNX_BADQUERYMEMORY,
     LIBNX_ALREADYINITIALIZED,
     LIBNX_NOTINITIALIZED,
@@ -36,8 +37,16 @@ enum {
     LIBNX_HEAPALLOCFAILED,
     LIBNX_TOOMANYOVERRIDES,
     LIBNX_PARCELERROR,
+    LIBNX_BADGFXINIT,
+    LIBNX_APPLETCMDIDNOTFOUND,
+    LIBNX_BADAPPLETRECEIVEMESSAGE,
+    LIBNX_BADAPPLETNOTIFYRUNNING,
+    LIBNX_BADAPPLETGETCURRENTFOCUSSTATE,
+    LIBNX_BADAPPLETGETOPERATIONMODE,
+    LIBNX_BADAPPLETGETPERFORMANCEMODE,
+    LIBNX_BADUSBCOMMSREAD,
     LIBNX_INITFAIL_SM,
     LIBNX_INITFAIL_AM,
     LIBNX_INITFAIL_HID,
-    LIBNX_INITFAIL_FS    
+    LIBNX_INITFAIL_FS,
 };
diff --git a/nx/source/gfx/gfx.c b/nx/source/gfx/gfx.c
index a84a01e7..a9f18207 100644
--- a/nx/source/gfx/gfx.c
+++ b/nx/source/gfx/gfx.c
@@ -314,7 +314,7 @@ void gfxInitDefault(void)
     }
 
     Result rc = _gfxInit(ViServiceType_Default, "Default", ViLayerFlags_Default, 0, nv_servicetype, 0x300000);
-    if (R_FAILED(rc)) fatalSimple(rc);
+    if (R_FAILED(rc)) fatalSimple(LIBNX_BADGFXINIT);
 }
 
 void gfxExit(void)
diff --git a/nx/source/kernel/virtmem.c b/nx/source/kernel/virtmem.c
index ad958471..03dbbda9 100644
--- a/nx/source/kernel/virtmem.c
+++ b/nx/source/kernel/virtmem.c
@@ -48,11 +48,11 @@ void virtmemSetup(void) {
     }
 
     if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_STACK], 2, 3))) {
-        fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO));
+        fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO_STACK));
     }
 
     if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) {
-        fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO));
+        fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO_HEAP));
     }
 
     // Failure is OK, happens on 1.0.0
diff --git a/nx/source/runtime/devices/usb_comms.c b/nx/source/runtime/devices/usb_comms.c
index 4932c398..626ef687 100644
--- a/nx/source/runtime/devices/usb_comms.c
+++ b/nx/source/runtime/devices/usb_comms.c
@@ -272,7 +272,7 @@ size_t usbCommsRead(void* buffer, size_t size)
         if (R_SUCCEEDED(ret2)) {
             if (state!=5) ret = _usbCommsRead(buffer, size, &transferredSize); //If state changed during transfer, try again. usbDsWaitReady() will be called from this.
         }
-        if (R_FAILED(ret))fatalSimple(ret);
+        if (R_FAILED(ret))fatalSimple(LIBNX_BADUSBCOMMSREAD);
     }
     return transferredSize;
 }
diff --git a/nx/source/services/applet.c b/nx/source/services/applet.c
index eec36eaa..0550dfa7 100644
--- a/nx/source/services/applet.c
+++ b/nx/source/services/applet.c
@@ -92,7 +92,7 @@ Result appletInitialize(void)
             case AppletType_OverlayApplet:     cmd_id = 300; break;
             case AppletType_SystemApplication: cmd_id = 350; break;
             // TODO: Replace error code
-            default: fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_NOTFOUND));
+            default: fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_APPLETCMDIDNOTFOUND));
             }
 
             rc = _appletGetSessionProxy(&g_appletProxySession, cmd_id, CUR_PROCESS_HANDLE, NULL);
@@ -507,7 +507,7 @@ void appletNotifyRunning(u8 *out) {
         }
     }
 
-    if (R_FAILED(rc)) fatalSimple(rc);
+    if (R_FAILED(rc)) fatalSimple(LIBNX_BADAPPLETNOTIFYRUNNING);
 }
 
 static Result _appletReceiveMessage(u32 *out) {
@@ -851,7 +851,7 @@ bool appletMainLoop(void) {
         if ((rc & 0x3fffff) == 0x680)
             return true;
 
-        fatalSimple(rc);
+        fatalSimple(LIBNX_BADAPPLETRECEIVEMESSAGE);
     }
 
     switch(msg) {
@@ -860,6 +860,8 @@ bool appletMainLoop(void) {
 
             if (R_SUCCEEDED(rc))
                 appletCallHook(AppletHookType_OnFocusState);
+            else
+                fatalSimple(LIBNX_BADAPPLETGETCURRENTFOCUSSTATE);
         break;
 
         case 0x1E:
@@ -867,6 +869,8 @@ bool appletMainLoop(void) {
 
             if (R_SUCCEEDED(rc))
                 appletCallHook(AppletHookType_OnOperationMode);
+            else
+                fatalSimple(LIBNX_BADAPPLETGETOPERATIONMODE);
         break;
 
         case 0x1F:
@@ -874,12 +878,11 @@ bool appletMainLoop(void) {
 
             if (R_SUCCEEDED(rc))
                 appletCallHook(AppletHookType_OnPerformanceMode);
+            else
+                fatalSimple(LIBNX_BADAPPLETGETPERFORMANCEMODE);
         break;
     }
 
-    if (R_FAILED(rc))
-        fatalSimple(rc);
-
     return true;
 }