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

* commit 'a0a46170f1e570e6aa0818bbb2da7a15c1013563':
  Replace a segfault with a warning.