Changed to finish if data not available