fixes nullpointer caused by broken organ list

the mysterious broken list bug has struck again
fixes nullpointer caused by broken organ list pt 2

more a prevention than a fix, but meh
Merge pull request #5783 from Walter0o/master

fixes nullpointer caused by broken organ list reading