My feeling is that the check to push out the reset time should occur as late as possible before the error count would be checked (i.e., on upload or delete). We could certainly check whether an upload is scheduled before fetching and checking that pref.