Added more guard for "successful" processing