Modify for support exception