am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev

* commit '9dd0029a05511d5e15c7fdb453b93f50d5b37d04':
  Replace a segfault with a warning.