diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
index 301adc198c2c..a9438e3f25e7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
@@ -88,7 +88,12 @@ public static TableDescriptorBuilder enable(TableDescriptorBuilder builder) thro
    * added.
    */
   public static TableDescriptorBuilder disable(TableDescriptorBuilder builder) throws IOException {
-    return builder.removeCoprocessor(ConstraintProcessor.class.getName());
+    try {
+      return builder.removeCoprocessor(ConstraintProcessor.class.getName());
+    } catch (IllegalArgumentException e) {
+      LOG.warn("ConstraintProcessor was unset.", e);
+      return builder;
+    }
   }
 
   /**