diff --git a/libraries/libstratosphere/include/stratosphere/os/os_condvar.hpp b/libraries/libstratosphere/include/stratosphere/os/os_condvar.hpp
index 9e31022b3..bf1d53a7e 100644
--- a/libraries/libstratosphere/include/stratosphere/os/os_condvar.hpp
+++ b/libraries/libstratosphere/include/stratosphere/os/os_condvar.hpp
@@ -39,7 +39,7 @@ namespace ams::os {
                     /* Abort on any error other than timed out/success. */
                     R_TRY_CATCH(condvarWaitTimeout(&this->cv, m, timeout)) {
                         R_CATCH(svc::ResultTimedOut) { return ConditionVariableStatus::TimedOut; }
-                    } R_END_TRY_CATCH_WITH_ASSERT;
+                    } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
                     return ConditionVariableStatus::Success;
                 }
diff --git a/libraries/libstratosphere/source/dd/dd_io_mappings.cpp b/libraries/libstratosphere/source/dd/dd_io_mappings.cpp
index 2095b2101..e71f98212 100644
--- a/libraries/libstratosphere/source/dd/dd_io_mappings.cpp
+++ b/libraries/libstratosphere/source/dd/dd_io_mappings.cpp
@@ -25,7 +25,7 @@ namespace ams::dd {
         R_TRY_CATCH(svcQueryIoMapping(&virtual_addr, aligned_addr, aligned_size)) {
             /* Official software handles this by returning 0. */
             R_CATCH(svc::ResultNotFound) { return 0; }
-        } R_END_TRY_CATCH_WITH_ASSERT;
+        } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
         return static_cast<uintptr_t>(virtual_addr + offset);
     }
diff --git a/libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp b/libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp
index e933a55bd..ae3e9863b 100644
--- a/libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp
@@ -23,7 +23,7 @@ namespace ams::os::impl {
             /* Create the event handles. */
             R_TRY_CATCH(svcCreateEvent(out_writable, out_readable)) {
                 R_CONVERT(svc::ResultOutOfResource, ResultOutOfResource());
-            } R_END_TRY_CATCH_WITH_ASSERT;
+            } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
             return ResultSuccess();
         }
@@ -120,14 +120,14 @@ namespace ams::os::impl {
             /* Continuously wait, until success. */
             R_TRY_CATCH(svcWaitSynchronizationSingle(handle, U64_MAX)) {
                 R_CATCH(svc::ResultCancelled) { continue; }
-            } R_END_TRY_CATCH_WITH_ASSERT;
+            } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
             /* Clear, if we must. */
             if (this->auto_clear) {
                 R_TRY_CATCH(svcResetSignal(handle)) {
                     /* Some other thread might have caught this before we did. */
                     R_CATCH(svc::ResultInvalidState) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
             }
             return;
         }
@@ -146,7 +146,7 @@ namespace ams::os::impl {
                 R_TRY_CATCH(svcWaitSynchronizationSingle(handle, 0)) {
                     R_CATCH(svc::ResultTimedOut) { return false; }
                     R_CATCH(svc::ResultCancelled) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
                 /* We succeeded, so we're signaled. */
                 return true;
@@ -163,14 +163,14 @@ namespace ams::os::impl {
             R_TRY_CATCH(svcWaitSynchronizationSingle(handle, timeout_helper.NsUntilTimeout())) {
                 R_CATCH(svc::ResultTimedOut) { return false; }
                 R_CATCH(svc::ResultCancelled) { continue; }
-            } R_END_TRY_CATCH_WITH_ASSERT;
+            } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
             /* Clear, if we must. */
             if (this->auto_clear) {
                 R_TRY_CATCH(svcResetSignal(handle)) {
                     /* Some other thread might have caught this before we did. */
                     R_CATCH(svc::ResultInvalidState) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
             }
 
             return true;
diff --git a/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp b/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
index 5f9b73b5e..2f66b7c0e 100644
--- a/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
@@ -105,7 +105,7 @@ namespace ams::os::impl{
             /* svc::ResultInvalidHandle. */
             /* svc::ResultInvalidPointer */
             /* svc::ResultOutOfRange */
-        } R_END_TRY_CATCH_WITH_ASSERT;
+        } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
         return index;
     }
diff --git a/libraries/libstratosphere/source/os/os_interrupt_event.cpp b/libraries/libstratosphere/source/os/os_interrupt_event.cpp
index efdee1a75..e700107c6 100644
--- a/libraries/libstratosphere/source/os/os_interrupt_event.cpp
+++ b/libraries/libstratosphere/source/os/os_interrupt_event.cpp
@@ -51,14 +51,14 @@ namespace ams::os {
             /* Continuously wait, until success. */
             R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), U64_MAX)) {
                 R_CATCH(svc::ResultCancelled) { continue; }
-            } R_END_TRY_CATCH_WITH_ASSERT;
+            } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
             /* Clear, if we must. */
             if (this->auto_clear) {
                 R_TRY_CATCH(svcResetSignal(this->handle.Get())) {
                     /* Some other thread might have caught this before we did. */
                     R_CATCH(svc::ResultInvalidState) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
             }
             return;
         }
@@ -77,7 +77,7 @@ namespace ams::os {
                 R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), 0)) {
                     R_CATCH(svc::ResultTimedOut) { return false; }
                     R_CATCH(svc::ResultCancelled) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
                 /* We succeeded, so we're signaled. */
                 return true;
@@ -94,14 +94,14 @@ namespace ams::os {
             R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), timeout_helper.NsUntilTimeout())) {
                 R_CATCH(svc::ResultTimedOut) { return false; }
                 R_CATCH(svc::ResultCancelled) { continue; }
-            } R_END_TRY_CATCH_WITH_ASSERT;
+            } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
             /* Clear, if we must. */
             if (this->auto_clear) {
                 R_TRY_CATCH(svcResetSignal(this->handle.Get())) {
                     /* Some other thread might have caught this before we did. */
                     R_CATCH(svc::ResultInvalidState) { continue; }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
             }
 
             return true;
diff --git a/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp b/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
index 1c6aef2e2..a3de70bad 100644
--- a/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
+++ b/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
@@ -167,7 +167,7 @@ namespace ams::sf::hipc {
                         needs_undefer_all = true;
                         continue;
                     }
-                } R_END_TRY_CATCH_WITH_ASSERT;
+                } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
 
                 /* We succeeded! Remove from deferred list. */
                 it = this->deferred_session_list.erase(it);
diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp
index 1cb79f720..16c53a487 100644
--- a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp
+++ b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp
@@ -413,7 +413,7 @@ namespace ams::i2c::driver::impl {
                 this->SetPacketMode();
                 this->FlushFifos();
             }
-        } R_END_TRY_CATCH_WITH_ASSERT;
+        } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
     }
 
     Result BusAccessor::GetAndHandleTransactionResult() {