Remove potential raciness caused by possibly not having the right collection

Also, snarky comments