I added those checks to prober and a couple tests for it; take a look and see if that's what you were thinking.