What situation does this cover? Would it be possible to get a test case to more clearly cover it? 

Everything else looks good, good stuff.