@@ -93,10 +93,12 @@
 proc exit args {
 	cleanup
 	_exit {*}$args
 }
 
+twapi::set_console_control_handler exit
+
 # Run tcpdump
 set exit 1
 set npf_failed 0
 if {[catch {
 	## Create directory
@@ -129,33 +131,20 @@
 	} npf_err]} {
 		set npf_failed 1
 	}
 
 	## Launch tcpdump with the apropriate parameters
-	exec -- [file join $filesdir tcpdump.exe] {*}$argv >&@ stdout
+	set tcpdumpexe [file join $filesdir tcpdump.exe]
+	exec -- $tcpdumpexe {*}$argv >&@ stdout
 
 	set exit 0
 } err]} {
 	if {$npf_failed} {
 		puts "NPF Failed: $npf_err"
+		puts "Failed: $err"
 	}
 
-	puts "Failed: $err"
-
 	set exit 1
 }
 
-
-# Cleanup
-catch {
-	::twapi::stop_service npf
-}
-catch {
-	::twapi::delete_service npf
-}
-
-catch {
-	file delete -force -- $dstdir
-}
-
 # Terminate
 exit $exit