Species and organ fixes.

Dupliate of #7518. Git diff being bad.
why not just '&& deathmessage'? Is null deathmessage used for soemthing else?