Added check that target location can be resolved