Short of doing a reset, I don't see any way to avoid this scenario currently. I'm not at the point of being able to update my device remotely yet, but warning lights are already flashing in my brain over this becoming an issue.