ref #4171 - fix error when editing a system and cancelling