Don't add location nil to locations array.
Merge branch 'locations'