More checking of location