Added exception handling to LocationsActivity
Merge remote-tracking branch 'origin/master'