Cleanup reporting of first stats; was not doing the right thing when errors occurred