am 3ecddeb9: am 99a2297e: Merge "Another error check" into klp-dev

* commit '3ecddeb951ee77bb2c2a33cee4dfbcc55e184c4c':
  Another error check