diff --git a/lib/msf/base/simple/auxiliary.rb b/lib/msf/base/simple/auxiliary.rb
index 5486f4deb1..11230328b0 100644
--- a/lib/msf/base/simple/auxiliary.rb
+++ b/lib/msf/base/simple/auxiliary.rb
@@ -113,6 +113,8 @@ module Auxiliary
     # be normalized
     mod.validate
 
+    mod.setup
+
     # Run check
     mod.check
   end
diff --git a/lib/msf/base/simple/exploit.rb b/lib/msf/base/simple/exploit.rb
index 320623bf68..389b336ed8 100644
--- a/lib/msf/base/simple/exploit.rb
+++ b/lib/msf/base/simple/exploit.rb
@@ -182,6 +182,8 @@ module Exploit
     # be normalized
     mod.validate
 
+    mod.setup
+
     # Run check
     mod.check
   end
diff --git a/lib/msf/core/post/common.rb b/lib/msf/core/post/common.rb
index f63a6677dc..2e340b14de 100644
--- a/lib/msf/core/post/common.rb
+++ b/lib/msf/core/post/common.rb
@@ -3,6 +3,8 @@
 module Msf::Post::Common
 
   def rhost
+    return nil unless session
+
     case session.type
     when 'meterpreter'
       session.sock.peerhost