Handle unknown devices better

Previously when attempting to watch a Device which was not known to the Directory we would end up in a tight loop. Insert retries and delays in appropriate places so that we recover from this situation gracefully.