Fix crashes OnArrival