Merge "Replace a segfault with a warning." into jb-mr1-dev