Skip -1 responses, add end / destroy handling