Checked the null pointer exception workaround for Sites species. Cleaned up some unused/outdated code.
Closes #17771