Merge pull request #5 from CleverRaven/master

Update
Missed 'my_fac != NULL' check
Merge pull request #8124 from acidia/evac_center_quickfix

NPC faction check fix