Issue #3427414: An additional check is if the location field isn't empty.