[#74278998] auto destroy droplet on error and other refactoring