Fix dead Editors exception
Merge pull request #23 from ddavison/ms-fixDeadEditors

Critical: Fix dead Editors exception