diff --git a/bochs/main.cc b/bochs/main.cc
index 8b6968136..d9a5c0467 100644
--- a/bochs/main.cc
+++ b/bochs/main.cc
@@ -310,12 +310,12 @@ bx_panic(char *fmt, ...)
     va_end(ap);
     }
 
-  bx_atexit();
-
 #if !BX_PANIC_IS_FATAL
   return;
 #endif    
 
+  bx_atexit();
+
 #if !BX_DEBUGGER
   exit(1);
 #else