diff --git a/contrib/import-control.xml b/contrib/import-control.xml
index 60eae350..f94af1ba 100644
--- a/contrib/import-control.xml
+++ b/contrib/import-control.xml
@@ -37,8 +37,6 @@
     <allow pkg="org.apache.accumulo.core.conf"/>
 
     <!-- TODO refactor code to remove the following exceptions -->
-    <allow class="org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType"/>
-    <allow class="org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException"/>
     <allow class="org.apache.accumulo.core.metadata.MetadataTable"/>
     <allow class="org.apache.accumulo.core.replication.ReplicationTable"/>
     <allow class="org.apache.accumulo.core.spi.scan.HintScanPrioritizer"/>
diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
index 33534031..b209d33d 100644
--- a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
+++ b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
@@ -20,8 +20,8 @@
 import java.util.SortedSet;
 
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.testing.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.randomwalk.State;
@@ -131,10 +131,8 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti
           env.getAccumuloClient().tableOperations().setProperty(table, property.getKey(),
               property.getDefaultValue());
         } catch (AccumuloException ex) {
-          if (ex.getCause() instanceof ThriftTableOperationException) {
-            ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
-            if (ttoe.type == TableOperationExceptionType.NOTFOUND)
-              return;
+          if (ex.getCause() instanceof TableNotFoundException) {
+            return;
           }
           throw ex;
         }
@@ -153,10 +151,8 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti
           env.getAccumuloClient().namespaceOperations().setProperty(namespace, property.getKey(),
               property.getDefaultValue());
         } catch (AccumuloException ex) {
-          if (ex.getCause() instanceof ThriftTableOperationException) {
-            ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
-            if (ttoe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND)
-              return;
+          if (ex.getCause() instanceof NamespaceNotFoundException) {
+            return;
           }
           throw ex;
         }
@@ -197,10 +193,8 @@ private void changeTableSetting(RandomDataGenerator random, State state, RandWal
       env.getAccumuloClient().tableOperations().setProperty(table, setting.property.getKey(),
           "" + newValue);
     } catch (AccumuloException ex) {
-      if (ex.getCause() instanceof ThriftTableOperationException) {
-        ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
-        if (ttoe.type == TableOperationExceptionType.NOTFOUND)
-          return;
+      if (ex.getCause() instanceof TableNotFoundException) {
+        return;
       }
       throw ex;
     }
@@ -228,10 +222,8 @@ private void changeNamespaceSetting(RandomDataGenerator random, State state, Ran
       env.getAccumuloClient().namespaceOperations().setProperty(namespace,
           setting.property.getKey(), "" + newValue);
     } catch (AccumuloException ex) {
-      if (ex.getCause() instanceof ThriftTableOperationException) {
-        ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
-        if (ttoe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND)
-          return;
+      if (ex.getCause() instanceof NamespaceNotFoundException) {
+        return;
       }
       throw ex;
     }