diff --git a/src/main/java/com/intel/jndn/management/Nfdc.java b/src/main/java/com/intel/jndn/management/Nfdc.java
index 2be7755..a48e88f 100644
--- a/src/main/java/com/intel/jndn/management/Nfdc.java
+++ b/src/main/java/com/intel/jndn/management/Nfdc.java
@@ -125,8 +125,7 @@
     try {
       List<Data> segments = FetchHelper.getSegmentedData(face, new Name("/localhost/nfd/rib/list"));
       return StatusDatasetHelper.wireDecode(segments, RibEntry.class);
-    } catch (ArrayIndexOutOfBoundsException | IOException e) {
-      // TODO: remove ArrayIndexOutOfBoundsException after fixing bug in MockFace
+    } catch (IOException e) {
       throw new ManagementException(e.getMessage(), e);
     }
   }