Fix: Correctly handle HijackException; Fix #30