Ensure that the WaitGroup isn't marked done twice when edgecase errors occurr