1 files changed, 2 insertions, 9 deletions
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java
index bc5951cbb..d50dbda89 100644
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java
+++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java
@@ -16,10 +16,7 @@
 
 package io.fd.hc2vpp.vpp.classifier.write;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
@@ -63,8 +60,8 @@ public class ClassifySessionWriter extends VppNodeWriter
                                  @Nonnull final VppClassifierContextManager classifyTableContext,
                                  @Nonnull final NamingContext policerContext) {
         super(futureJVppCore);
-        this.classifyTableContext = checkNotNull(classifyTableContext, "classifyTableContext should not be null");
-        this.policerContext = checkNotNull(policerContext, "policerContext should not be null");
+        this.classifyTableContext = classifyTableContext;
+        this.policerContext = policerContext;
     }
 
     @Override
@@ -106,11 +103,7 @@ public class ClassifySessionWriter extends VppNodeWriter
                                        @Nonnull final WriteContext writeContext)
             throws VppBaseCallException, WriteFailedException {
         final ClassifyTableKey tableKey = id.firstKeyOf(ClassifyTable.class);
-        Preconditions.checkArgument(tableKey != null, "could not find classify table key in {}", id);
-
         final String tableName = tableKey.getName();
-        Preconditions.checkState(classifyTableContext.containsTable(tableName, writeContext.getMappingContext()),
-                "Could not find classify table index for {} in the classify table context", tableName);
         final int tableIndex = classifyTableContext.getTableIndex(tableName, writeContext.getMappingContext());
 
         final ClassifyTable classifyTable = getClassifyTable(writeContext, id, isAdd);