Fix remove potential memory leak by wrapping executor.removeController in finally.