fix exceptions regression