Comment 2 for bug 1525452

Still need to figure out the unit tests here.. .but the fix is up.

There are some other problems I noticed here. Even though we have unit tests for it, we don't clean up the ref objects we create in failure scenarios (go figure, unit tests work, but it doesn't actually delete). Also, we silently eat just about every single error message that gets generated in all of this, making it pretty tough to ever debug anything.

I'll open a separate bug for the delete/cleanup stuff after I figure it out a bit more.