Correctly check for data location present