Do a two step checkout to avoid checking out connections before use

[fishcakez]

I think this is the right fix. I'll merge and make the change so you dont have to rebase :D.