* Handle missing device when linking
Sometimes a device is gone, but data still points to it. Prevent error when that happens (even though it should not)
* Handle more gracefully
* Remove original work around
* Allow unsaved devices, we just need device_id really