Added Try/Catch and null check on CurrentLocation.