whoops, this isn't relevant to this pull. But useful anyways (it was force closing when the location wasn't set)