Updated catching AssumptionViolatedException to use the internal version #818

This allows backwards compatibility with third-party code that directly throws internal version