diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c
index a44adf2540..f11e16b52b 100644
--- a/src/boot/stackcheck.c
+++ b/src/boot/stackcheck.c
@@ -99,7 +99,7 @@ StackStatus StackCheck_GetState(StackEntry* entry) {
     }
 
     osSyncPrintf("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free,
-                 entry->name ? entry->name : "(null)");
+                 entry->name != NULL ? entry->name : "(null)");
     osSyncPrintf(VT_RST);
 
     if (ret != STACK_STATUS_OK) {
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 2235cf6cce..03de472325 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -1699,7 +1699,8 @@ void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, cons
     osSyncPrintf("%c", 7);
     osSyncPrintf(VT_FGCOL(RED));
     osSyncPrintf("DMA致命的エラー(%s)\nROM:%X RAM:%X SIZE:%X %s\n",
-                 errorDesc ? errorDesc : (errorName ? errorName : "???"), vrom, ram, size, file ? file : "???");
+                 errorDesc != NULL ? errorDesc : (errorName != NULL ? errorName : "???"), vrom, ram, size,
+                 file != NULL ? file : "???");
 
     if (req->filename) {
         osSyncPrintf("DMA ERROR: %s %d", req->filename, req->line);
@@ -1714,10 +1715,10 @@ void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, cons
     } else if (sDmaMgrCurFileName) {
         sprintf(buff1, "DMA ERROR: %s %d", sDmaMgrCurFileName, sDmaMgrCurFileLine);
     } else {
-        sprintf(buff1, "DMA ERROR: %s", errorName ? errorName : "???");
+        sprintf(buff1, "DMA ERROR: %s", errorName != NULL ? errorName : "???");
     }
 
-    sprintf(buff2, "%07X %08X %X %s", vrom, ram, size, file ? file : "???");
+    sprintf(buff2, "%07X %08X %X %s", vrom, ram, size, file != NULL ? file : "???");
     Fault_AddHungupAndCrashImpl(buff1, buff2);
 }
 
diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c
index b42effe081..fc351a8e48 100644
--- a/src/code/__osMalloc.c
+++ b/src/code/__osMalloc.c
@@ -708,7 +708,7 @@ void __osDisplayArena(Arena* arena) {
 
             if (!iter->isFree) {
                 osSyncPrintf(" [%016llu:%2d:%s:%d]", OS_CYCLES_TO_NSEC(iter->time), iter->threadId,
-                             iter->filename ? iter->filename : "**NULL**", iter->line);
+                             iter->filename != NULL ? iter->filename : "**NULL**", iter->line);
             }
 
             osSyncPrintf("\n");
diff --git a/src/code/fault.c b/src/code/fault.c
index 96398efb91..454fb11e04 100644
--- a/src/code/fault.c
+++ b/src/code/fault.c
@@ -703,7 +703,7 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) {
     Fault_FillScreenBlack();
     FaultDrawer_SetCharPad(-2, 0);
 
-    FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title ? title : "PrintDump", alignedAddr);
+    FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title != NULL ? title : "PrintDump", alignedAddr);
     if (alignedAddr >= (u32*)0x80000000 && alignedAddr < (u32*)0xC0000000) {
         for (y = 0x1C; y != 0xE2; y += 9) {
             FaultDrawer_DrawText(0x18, y, "%06x", writeAddr);
@@ -1056,11 +1056,11 @@ void Fault_Init(void) {
 
 void Fault_HangupFaultClient(const char* arg0, const char* arg1) {
     osSyncPrintf("HungUp on Thread %d\n", osGetThreadId(0));
-    osSyncPrintf("%s\n", arg0 ? arg0 : "(NULL)");
-    osSyncPrintf("%s\n", arg1 ? arg1 : "(NULL)");
+    osSyncPrintf("%s\n", arg0 != NULL ? arg0 : "(NULL)");
+    osSyncPrintf("%s\n", arg1 != NULL ? arg1 : "(NULL)");
     FaultDrawer_Printf("HungUp on Thread %d\n", osGetThreadId(0));
-    FaultDrawer_Printf("%s\n", arg0 ? arg0 : "(NULL)");
-    FaultDrawer_Printf("%s\n", arg1 ? arg1 : "(NULL)");
+    FaultDrawer_Printf("%s\n", arg0 != NULL ? arg0 : "(NULL)");
+    FaultDrawer_Printf("%s\n", arg1 != NULL ? arg1 : "(NULL)");
 }
 
 void Fault_AddHungupAndCrashImpl(const char* arg0, const char* arg1) {