diff --git a/fusee/fusee-secondary/src/main.c b/fusee/fusee-secondary/src/main.c
index 6246a0f76..b47a69ac0 100644
--- a/fusee/fusee-secondary/src/main.c
+++ b/fusee/fusee-secondary/src/main.c
@@ -58,18 +58,18 @@ static void exit_callback(int rc) {
 int main(int argc, void **argv) {
     loader_ctx_t *loader_ctx = get_loader_ctx();
 
-    /* Initialize the display, console, FS, etc. */
-    setup_env();
-
     if (argc != STAGE2_ARGC) {
-        fatal_error("Invalid argc (expected %d, got %d)!\n", STAGE2_ARGC, argc);
+        generic_panic();
     }
     g_stage2_args = (stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT];
 
     if(g_stage2_args->version != 0) {
-        fatal_error("Incorrect Stage2 args version (expected %lu, got %lu)!\n", 0ul, g_stage2_args->version);
+        generic_panic();
     }
 
+    /* Initialize the display, console, FS, etc. */
+    setup_env();
+
     printf(u8"Welcome to Atmosphère Fusée Stage 2!\n");
     printf("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]);