Bug fix, notes, warning if location is null