Added catching the current location by adding a new location if it is not specified