fix: Handles null values in data during the retrieval

fix: Handles null values in data during the retrieval #421