Fixed nullreference when no current location