SWITCHYARD-2337 - Fixing an issue with NPE on dispose in the editor.
Also now fixes SWITCHYARD-2454