BUG: Fixing crash when saving link state

Found an intermittent crash where the Target Proxy of a link has been deleted.

Also simplified a return condition by removing redundant code - I would have thought it should have been found by clang.tidy