Issue #2361975 - Add extra array for exceptions.