Fixed problem with nil locations