am c2c2b63a: am a84d34e8: am 32ddc833: Merge "Protect against class cast exception" into klp-dev

* commit 'c2c2b63ad9d47b02a6c11b7af7d5fcd6e8411e62':
  Protect against class cast exception