Added null check to currentLocation in Dynamic Activity