Pushed more error finding into the collector