diff --git a/run-basic-batch-operators-test.sh b/run-basic-batch-operators-test.sh
index 89781e05d..404a58429 100755
--- a/run-basic-batch-operators-test.sh
+++ b/run-basic-batch-operators-test.sh
@@ -319,6 +319,28 @@ while IFS=, read -r package_name catalog; do
 	cleanup
 	waitDeleteNamespace "$ns"
 
+	# Check parsing claim file
+	./tnf claim show csv -c "$reportDir"/claim.json -n "$package_name" -t "$CNF_TYPE" "$addHeaders" || {
+
+		# if parsing claim file fails, skip this operator
+		# Add per operator links
+		{
+			# Add error message
+			echo "Results for: <b>$package_name</b>, "'<span style="color: red;">Operator installation failed due to claim parsing error, skipping test</span>'
+
+			# Add tnf_config link
+			echo ", tnf_config: "
+			echo '<a href="/'"$REPORT_FOLDER_RELATIVE"'/'"$package_name"'/tnf_config.yml">'"link"'</a>'
+
+			# New line
+			echo "<br>"
+		} >>"$REPORT_FOLDER/$INDEX_FILE"
+
+		cleanup
+
+		continue
+	}
+
 	# merge claim.json from each operator to a single csv file
 	./tnf claim show csv -c "$reportDir"/claim.json -n "$package_name" -t "$CNF_TYPE" "$addHeaders" >>"$REPORT_FOLDER"/results.csv