More careful handling of malformed effective masses