I don't think this is actually a problem is it - afaict InstanceNotFound is caught everywhere it needs to be?
I don't think this is actually a problem is it - afaict InstanceNotFound is caught everywhere it needs to be?