diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
index d9397864901e53846cf9c752214b62973186d3e4..9b8ff5b3ec52d2d062d55be6244c3da2f0a5f46c 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
@@ -16,6 +16,7 @@ package org.opengroup.osdu.indexer.schema.converter;
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
+import org.opengroup.osdu.core.common.search.Preconditions;
 import org.opengroup.osdu.indexer.schema.converter.tags.AllOfItem;
 import org.opengroup.osdu.indexer.schema.converter.tags.Definition;
 import org.opengroup.osdu.indexer.schema.converter.tags.Definitions;
@@ -67,7 +68,7 @@ class PropertiesProcessor {
     }
 
     protected Stream<Map<String, Object>> processItem(AllOfItem allOfItem) {
-        assert allOfItem!= null;
+        Preconditions.checkNotNull(allOfItem, "ref cannot be null");
 
         String ref = allOfItem.getRef();
 
@@ -76,7 +77,7 @@ class PropertiesProcessor {
     }
 
     public Stream<Map<String, Object>> processRef(String ref) {
-        assert ref!= null;
+        Preconditions.checkNotNull(ref, "allOfItem cannot be null");
 
         if (!ref.contains(DEF_PREFIX)) {
             return Stream.empty();
@@ -99,7 +100,7 @@ class PropertiesProcessor {
     }
 
     protected Stream<Map<String, Object>> processPropertyEntry(Map.Entry<String, TypeProperty> entry) {
-        assert entry!= null;
+        Preconditions.checkNotNull(entry, "entry cannot be null");
 
         if ("object".equals(entry.getValue().getType())
                 && Objects.isNull(entry.getValue().getItems())
@@ -130,8 +131,8 @@ class PropertiesProcessor {
     }
 
     protected Stream<Map<String, Object>> storageSchemaEntry(String kind, String path) {
-        assert kind!= null;
-        assert path!= null;
+        Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
+        Preconditions.checkNotNullOrEmpty(path, "path cannot be null or empty");
 
         Map<String, Object> map = new HashMap<>();
         map.put("kind", kind);
@@ -140,7 +141,7 @@ class PropertiesProcessor {
     }
 
     protected String getTypeByDefinitionProperty(TypeProperty definitionProperty) {
-        assert definitionProperty!= null;
+        Preconditions.checkNotNull(definitionProperty, "definitionProperty cannot be null");
 
         String pattern = definitionProperty.getPattern();
         String format = definitionProperty.getFormat();
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
index c8b38cd4e9e0c9515a9f1f0c61b3efd5732d44f4..235a1fbe50d5fd94f4e81bf92e0cc3765dc96bcc 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
+import org.opengroup.osdu.core.common.search.Preconditions;
 import org.opengroup.osdu.indexer.schema.converter.interfaces.SchemaToStorageFormat;
 import org.opengroup.osdu.indexer.schema.converter.tags.*;
 import org.springframework.stereotype.Component;
@@ -37,24 +38,22 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat {
 
     @Inject
     public SchemaToStorageFormatImpl(ObjectMapper objectMapper) {
-        assert objectMapper!= null;
+        Preconditions.checkNotNull(objectMapper, "objectMapper cannot be null");
 
         this.objectMapper = objectMapper;
     }
 
     @Override
     public String convertToString(final String schemaServiceFormat, String kind) {
-        assert schemaServiceFormat!= null;
-        assert kind!= null;
-        assert !kind.isEmpty();
+        Preconditions.checkNotNullOrEmpty(schemaServiceFormat, "schemaServiceFormat cannot be null or empty");
+        Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
 
         return saveJsonToString(convert(parserJsonString(schemaServiceFormat), kind));
     }
 
     public Map<String, Object> convertToMap(final String schemaServiceFormat, String kind) {
-        assert schemaServiceFormat!= null;
-        assert kind!= null;
-        assert !kind.isEmpty();
+        Preconditions.checkNotNullOrEmpty(schemaServiceFormat, "schemaServiceFormat cannot be null or empty");
+        Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
 
         return convert(parserJsonString(schemaServiceFormat), kind);
     }
@@ -76,9 +75,8 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat {
     }
 
     public Map<String, Object> convert(SchemaRoot schemaServiceSchema, String kind) {
-        assert schemaServiceSchema!= null;
-        assert kind!= null;
-        assert !kind.isEmpty();
+        Preconditions.checkNotNull(objectMapper, "schemaServiceSchema cannot be null");
+        Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
 
         PropertiesProcessor propertiesProcessor = new PropertiesProcessor(schemaServiceSchema.getDefinitions());