Sync error catching

Fix some more problems with sync
The migration service has disappeared I guess?