Fixes more long existing NPE's resulting from negative model selections.