Better handling of linearization errors