fix: improve parsing logic to handle empty results

fix: improve parsing logic to handle empty results #2137