Better error handling for exceptions during exploitation #5000
Merge branch 'master' into develop