Improve handling of broken data

Change-Id: I39afa2ad58ce39db3ce171876a0c3a5c540271df
4 files changed