Added a null pointer check. Re #6951.
Merge remote branch 'origin/bugfix/6951_arrow_tool_crash'