Translation fix; more paranoid checking.