diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index 84ca09995..a318e4f02 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -35,6 +35,7 @@ jobs:
           cd build/artifact
           zip flycast.nro.zip flycast.nro
           rm -f flycast.nro
+        if: matrix.config.destDir != ''
 
       - name: Configure AWS Credentials
         id: aws-credentials
diff --git a/core/hw/sh4/dyna/decoder.cpp b/core/hw/sh4/dyna/decoder.cpp
index b418c10c8..2e02d0d23 100644
--- a/core/hw/sh4/dyna/decoder.cpp
+++ b/core/hw/sh4/dyna/decoder.cpp
@@ -982,7 +982,7 @@ bool dec_DecodeBlock(RuntimeBlockInfo* rbi,u32 max_cycles)
 					}
 
 					if (state.cpu.is_delayslot && OpDesc[op]->SetPC())
-						throw FlycastException("Fatal: SH4 branch instuction in delay slot");
+						throw FlycastException("Fatal: SH4 branch instruction in delay slot");
 					if (!OpDesc[op]->rec_oph)
 					{
 						if (!dec_generic(op))
diff --git a/shell/libretro/libretro.cpp b/shell/libretro/libretro.cpp
index 12d905106..250e3f2fa 100644
--- a/shell/libretro/libretro.cpp
+++ b/shell/libretro/libretro.cpp
@@ -846,14 +846,13 @@ void retro_run()
 		// Render
 		is_dupe = true;
 		for (int i = 0; i < 5 && is_dupe; i++)
-		{
 			is_dupe = !rend_single_frame(true);
-			if (!dc_is_running()) {
-				std::string error = dc_get_last_error();
-				if (!error.empty())
-					gui_display_notification(error.c_str(), 5000);
-				environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, NULL);
-			}
+		// If emulator still isn't running, something's wrong
+		if (!dc_is_running()) {
+			std::string error = dc_get_last_error();
+			if (!error.empty())
+				gui_display_notification(error.c_str(), 5000);
+			environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, NULL);
 		}
 	}
 	else