diff --git a/src/windows.c b/src/windows.c
index 7326dd7a2..ad7b91b0d 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -294,7 +294,8 @@ const char *s;
                          s, buf);
     }
 
-    if (windowprocs.win_raw_print == def_raw_print)
+    if (windowprocs.win_raw_print == def_raw_print
+            || WINDOWPORT("safe-startup"))
         nh_terminate(EXIT_SUCCESS);
 }