Yikes!

A recent change to fix a bug caused a much more annoying bug, that actually caused us to crash a few times in the last 2 evenings...I think I have it squished and things ought to be back to normal.