am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"

* commit '4afd8ff474eb0e363a14393298b3f372ce813d1d':
  Fix a test and crash with a better error message when reading