* add some extra error checking; fixes NB#80432