Missed another
Fix #4156 - NoMethodError undefined method `stop'

This will fix #4156. It also fixes NoMethodError payload_exe
when I was trying to fix the undef 'stop' one
Land #4161, "stop" NilClass fix