am ef41d238: am c0b74902: Merge change 24171 into eclair

Merge commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc'

* commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc':
  Turn an assert into an error to handle bad struct members more gracefully.