Add saturation protection and error raising by default