I left this in only to make sure that there wasn't some IllegalStateException I hadn't found that could bubble up, like from the ProblemDetector, etc.  I'm ok eliminating this, but I didn't want the scope of this PR to get much bigger than solving the issue at hand.