BS-7385 : Limit the number of wrapping once exception is caught