Fix a regression for English dictionary and improve error reporting