SF2: Fix crash with stacking/arp
Merge pull request #976 from diizy/master

SF2: Fix crash with stacking/arp