diff --git a/src/fastfield/multivalued/writer.rs b/src/fastfield/multivalued/writer.rs
index 821fcaa4ba..07a9bb9c51 100644
--- a/src/fastfield/multivalued/writer.rs
+++ b/src/fastfield/multivalued/writer.rs
@@ -365,7 +365,9 @@ impl MultiValueU128FastFieldWriter {
         for field_value in doc.field_values() {
             if field_value.field == self.field {
                 let value = field_value.value();
-                let ip_addr = value.as_ip().unwrap();
+                let ip_addr = value
+                    .as_ip()
+                    .expect(&format!("expected and ip, but got {:?}", value));
                 let value = ip_addr.to_u128();
                 self.add_val(value);
             }
diff --git a/src/fastfield/writer.rs b/src/fastfield/writer.rs
index 8a37609c1a..ab91b48084 100644
--- a/src/fastfield/writer.rs
+++ b/src/fastfield/writer.rs
@@ -329,7 +329,10 @@ impl U128FastFieldWriter {
     pub fn add_document(&mut self, doc: &Document) {
         match doc.get_first(self.field) {
             Some(v) => {
-                let ip_addr = v.as_ip().unwrap();
+                let ip_addr = v
+                    .as_ip()
+                    .expect(&format!("expected and ip, but got {:?}", v));
+
                 let value = ip_addr.to_u128();
                 self.add_val(value);
             }
diff --git a/src/schema/field_type.rs b/src/schema/field_type.rs
index ebcfa6d2b0..19bc09f297 100644
--- a/src/schema/field_type.rs
+++ b/src/schema/field_type.rs
@@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 use thiserror::Error;
 
-use super::Cardinality;
 use super::ip_options::IpOptions;
+use super::Cardinality;
 use crate::schema::bytes_options::BytesOptions;
 use crate::schema::facet_options::FacetOptions;
 use crate::schema::{