Collector: enhanced error handling