diff --git a/lib/msf/core/exploit_driver.rb b/lib/msf/core/exploit_driver.rb
index 9ce761a05f..9eae7f4aee 100644
--- a/lib/msf/core/exploit_driver.rb
+++ b/lib/msf/core/exploit_driver.rb
@@ -172,6 +172,10 @@ protected
 			end
 		rescue
 			elog("Exploit failed: #{$!}", 'core', LEV_0)
+
+			payload.stop_handler
+			exploit.cleanup
+
 			raise $!
 		end
 	end