Changed location field to not be added if invalid