Fix NPE in LocationUpdater by adding paranoiac checks
Merge branch 'fix-npe-in-locationupdater-#138'