Handle tokenizer crashes more gracefully

Change-Id: I6b7300fd81e19ec608d892331efcdcea5611dfbc
4 files changed