More consistent handling of FE errors