Adding logic for delete on non-existing location