Plugins now die gracefully