Ah, right.  Should we be throwing real exceptions now rather than using assert?