diff --git a/lib/msf/core/exploit_driver.rb b/lib/msf/core/exploit_driver.rb
index eb484be11d..58eb23c728 100644
--- a/lib/msf/core/exploit_driver.rb
+++ b/lib/msf/core/exploit_driver.rb
@@ -135,7 +135,7 @@ class ExploitDriver
 				'Payload' => payload.refname)
 
 			# Call the exploit success handler
-			framework.events.on_exploit_success(exploit, session)
+			exploit.framework.events.on_exploit_success(exploit, session)
 		end
 
 		return session
diff --git a/lib/msf/core/session.rb b/lib/msf/core/session.rb
index 9ddb6e8b99..0f8721b7e4 100644
--- a/lib/msf/core/session.rb
+++ b/lib/msf/core/session.rb
@@ -123,10 +123,18 @@ module Session
 		"session_#{name.to_s}"
 	end
 
+	#
+	# This method logs the supplied buffer as coming from the remote side of
+	# the session.
+	#
 	def log_from_remote(buf)
 		rlog(buf, log_source)
 	end
 
+	#
+	# This method logs the supplied buffer as coming from the local side of
+	# the session.
+	#
 	def log_from_local(buf)
 		rlog(buf, log_source)
 	end
diff --git a/lib/msf/core/session/interactive.rb b/lib/msf/core/session/interactive.rb
index feb88ffcb5..d24f6a8553 100644
--- a/lib/msf/core/session/interactive.rb
+++ b/lib/msf/core/session/interactive.rb
@@ -43,7 +43,11 @@ module Interactive
 	# Returns the remote peer information
 	#
 	def tunnel_peer
-		rstream.peerinfo
+		begin
+			rstream.peerinfo
+		rescue
+			framework.sessions.deregister(sid)
+		end
 	end
 	
 	#