apply the walterhiggins fix for CanaryEntityThrowable