More updates to tracking failed collection. Need to test.