diff --git a/firewall/firewall_windows.go b/firewall/firewall_windows.go
index ba33d44c..0f959bd2 100644
--- a/firewall/firewall_windows.go
+++ b/firewall/firewall_windows.go
@@ -49,8 +49,6 @@ func (f WindowsFirewall) EnableForwarding(enabled bool) error {
 		return fmt.Errorf("Unexpected netsh output: %s", out)
 	}
 
-	fmt.Printf("%s\n", out)
-
 	return nil
 }
 
diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go
index 6e757f37..8f23b5d1 100644
--- a/session/session_core_handlers.go
+++ b/session/session_core_handlers.go
@@ -95,7 +95,9 @@ func (s *Session) activeHandler(args []string, sess *Session) error {
 
 func (s *Session) exitHandler(args []string, sess *Session) error {
 	for _, mod := range s.Modules {
-		mod.Stop()
+		if mod.Running() {
+			mod.Stop()
+		}
 	}
 
 	s.Active = false