Comment 5 for bug 1098409

BTW sorry about the slow progress on merging this. I pulled in the test case first so that I could spend some time looking for different angles on how not testing the return could go wrong.

At this point I am comfortable enough with this, so I will go on and merge it.

Thanks for your patience.