Added check for missing tokens, but error passed back