better propagation of bad name token errors