Merge "Fix exception handling ixload"