am d7e8d9a7: Guard against malformed files

* commit 'd7e8d9a7393b5429f8f13a6794b9b04d37390fb5':
  Guard against malformed files