Fixed no location stored causing an error