While reviewing #34821, I noticed that we use org.assertj.core.api.Assertions.catchThrowable(ThrowingCallable) when we really should be using assertThatExceptionOfType() or similar.