Added some logic that attempts to reimport a sandbox in case resync fails.
Closes #2