Make location optional