Range attack clean up, prevent possible nullptr checks.
Merge pull request #312 from KayenEQ/Development

Range attack functions clean up, prevent possible nullptr checks.