Sanitize stop handling