Merge "Add 0,0 location check"