Dropping return codes and using text matching