My apologies: fixed two crashers in last rev.