diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index d2042bfa22e..c5b7b1ee3a9 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -204,7 +204,7 @@ void info_win32_module(DWORD base)
     int                 i, j, num_printed = 0;
     DWORD               opt;
 
-    if (!dbg_curr_process || !dbg_curr_thread)
+    if (!dbg_curr_process)
     {
         dbg_printf("Cannot get info on module while no process is loaded\n");
         return;
diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c
index 8dbca971f7a..d87f4c20552 100644
--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@@ -927,6 +927,9 @@ enum dbg_start dbg_active_auto(int argc, char* argv[])
     else return start_error_parse;
     if (hFile == INVALID_HANDLE_VALUE) return start_error_parse;
 
+    if (dbg_curr_process->active_debuggee)
+        dbg_active_wait_for_first_exception();
+
     dbg_interactiveP = TRUE;
     parser_handle(hFile);