Fixed major error happpening on miss-fetch of location