Null Ref exception resolved?

Core:\n- Fixed a NRE caused by arrow checks.