Add Error propagation now that we use Throwable.