am 2e496677: am 5572b3af: Replace assert with error message

* commit '2e496677be678f5201d0e6c3712c664dd60502d9':
  Replace assert with error message