diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx
index cd9762eb..c774be27 100644
--- a/src/dialogs/fl_digi.cxx
+++ b/src/dialogs/fl_digi.cxx
@@ -1273,59 +1273,73 @@ void remove_windows()
 	if (scopeview) {
 		scopeview->hide();
 		delete scopeview;
+		scopeview = 0;
 	}
 	if (dlgViewer) {
 		dlgViewer->hide();
 		delete dlgViewer;
+		dlgViewer = 0;
 	}
 	if (dlgLogbook) {
 		dlgLogbook->hide();
 		delete dlgLogbook;
+		dlgLogbook = 0;
 	}
 	if (dlgConfig) {
 		dlgConfig->hide();
-		delete cboHamlibRig;
+		delete cboHamlibRig; // ??
 		delete dlgConfig;
+		dlgConfig = 0;
 	}
 	if (font_browser) {
 		font_browser->hide();
 		delete font_browser;
+		font_browser = 0;
 	}
 	if (notify_window) {
 		notify_window->hide();
 		delete notify_window;
+		notify_window = 0;
 	}
 	if (dxcc_window) {
 		dxcc_window->hide();
 		delete dxcc_window;
+		dxcc_window = 0;
 	}
 	if (picRxWin) {
 		picRxWin->hide();
 		delete picRxWin;
+		picRxWin = 0;
 	}
 	if (picTxWin) {
 		picTxWin->hide();
 		delete picTxWin;
+		picTxWin = 0;
 	}
 	if (fsqpicRxWin){
 		fsqpicRxWin->hide();
 		delete fsqpicRxWin;
+		fsqpicRxWin = 0;
 	}
 	if (fsqpicTxWin){
 		fsqpicTxWin->hide();
 		delete fsqpicTxWin;
+		fsqpicTxWin = 0;
 	}
 	if (ifkppicRxWin){
 		ifkppicRxWin->hide();
 		delete ifkppicRxWin;
+		ifkppicRxWin = 0;
 	}
 	if (ifkppicTxWin){
 		ifkppicTxWin->hide();
 		delete ifkppicTxWin;
+		ifkppicTxWin = 0;
 	}
 	if (thorpicRxWin){
 		thorpicRxWin->hide();
 		delete thorpicRxWin;
+		thorpicRxWin = 0;
 	}
 	if (thorpicTxWin){
 		thorpicTxWin->hide();
@@ -1334,35 +1348,35 @@ void remove_windows()
 	if (wefax_pic_rx_win) {
 		wefax_pic_rx_win->hide();
 		delete wefax_pic_rx_win;
+		wefax_pic_rx_win = 0;
 	}
 	if (wefax_pic_tx_win) {
 		wefax_pic_tx_win->hide();
 		delete wefax_pic_tx_win;
+		wefax_pic_tx_win = 0;
 	}
 	if (wExport) {
 		wExport->hide();
 		delete wExport;
+		wExport = 0;
 	}
 	if (wCabrillo) {
 		wCabrillo->hide();
 		delete wCabrillo;
+		wCabrillo = 0;
 	}
 	if (MacroEditDialog) {
 		MacroEditDialog->hide();
 		delete MacroEditDialog;
+		MacroEditDialog = 0;
 	}
 	if (fsqMonitor) {
 		fsqMonitor->hide();
 		delete fsqMonitor;
+		fsqMonitor = 0;
 	}
 	tgroup->hide_all();
 
-//	if (fsqDebug) {
-//		fsqDebug->hide();
-//		delete fsqDebug;
-//	}
-
-	debug::stop();
 }
 
 // callback executed from Escape / Window decoration 'X' or OS X cmd-Q
@@ -1372,6 +1386,14 @@ void remove_windows()
 // Lion also does not allow any dialog other than the main dialog to
 // remain open after a Red-X exit
 
+void noop()
+{
+	FILE *exitlog = fopen(string(HomeDir).append("status_log.txt").c_str(), "a");
+	fprintf(exitlog,"\n=========================\nfltk called terminate\n=========================\n");
+	fclose(exitlog);
+	exit(128 + SIGABRT);
+}
+
 void cb_wMain(Fl_Widget*, void*)
 {
 #ifdef __APPLE__
@@ -1384,6 +1406,8 @@ void cb_wMain(Fl_Widget*, void*)
 	if (!clean_exit(true)) return;
 #endif
 	remove_windows();  // more Apple Lion madness
+
+	std::set_terminate(noop);
 	fl_digi_main->hide();
 }
 
@@ -1391,8 +1415,10 @@ void cb_wMain(Fl_Widget*, void*)
 void cb_E(Fl_Menu_*, void*) {
 	if (!clean_exit(true))
 		return;
-	remove_windows();
-// this will make Fl::run return
+
+	remove_windows();  // more Apple Lion madness
+
+	std::set_terminate(noop);
 	fl_digi_main->hide();
 }
 
diff --git a/src/main.cxx b/src/main.cxx
index 9fa2fdcb..b9df6621 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -789,13 +789,14 @@ void exit_process() {
 	if (progdefaults.usepskrep)
 		pskrep_stop();
 
+LOG_INFO("Detach/delete qrunner threads");
 	for (int i = 0; i < NUM_QRUNNER_THREADS; i++) {
+LOG_INFO("thread %d", i);
 		cbq[i]->detach();
 		delete cbq[i];
 	}
-
+LOG_INFO("FSEL::destroy()");
 	FSEL::destroy();
-
 }
 
 void generate_option_help(void) {
diff --git a/src/misc/arq_io.cxx b/src/misc/arq_io.cxx
index 04e6f0c0..fb5f1de2 100644
--- a/src/misc/arq_io.cxx
+++ b/src/misc/arq_io.cxx
@@ -528,12 +528,10 @@ bool ARQ_SOCKET_Server::start(const char* node, const char* service)
 
 void ARQ_SOCKET_Server::stop(void)
 {
-	// FILEME - uncomment when we have an ARQ_SOCKET_Server than can be
-	// interrupted
-	//	if (!inst)
-	//		return;
-	//	delete inst;
-	//	inst = 0;
+	if (!inst)
+		return;
+	delete inst;
+	inst = 0;
 }
 
 void* ARQ_SOCKET_Server::thread_func(void*)
diff --git a/src/misc/debug.cxx b/src/misc/debug.cxx
index fd46f4af..29fecfab 100644
--- a/src/misc/debug.cxx
+++ b/src/misc/debug.cxx
@@ -169,6 +169,7 @@ void debug::stop(void)
 	if (window) {
 		window->hide();
 		delete window;
+		window = 0;
 	}
 	if (inst) {
 		delete inst;