fixed issue with failures for non-Avro topics
clean up