Fix combat null pointers

Fix combat null pointers #8682