Small refactor.
Storing last location up to 5 mins if no new one comes (if new location is null), then override it.