Null protection on thresholds, and include isAutomaticModelRunsEnabled