diff --git a/src/main/java/com/intel/jndn/utils/SegmentedClient.java b/src/main/java/com/intel/jndn/utils/SegmentedClient.java
index b82051e..aa9cb1a 100644
--- a/src/main/java/com/intel/jndn/utils/SegmentedClient.java
+++ b/src/main/java/com/intel/jndn/utils/SegmentedClient.java
@@ -124,7 +124,7 @@
     try {
       lastSegment = segments.get(0).get().getMetaInfo().getFinalBlockId().toSegment();
     } catch (ExecutionException | InterruptedException e) {
-      logger.log(Level.SEVERE, "Failed to retrieve first segment: ", e);
+      logger.log(Level.FINE, "Failed to retrieve first segment: ", e);
       ((FutureData) segments.get(0)).reject(e); // TODO implies knowledge of underlying data structure
       return segments;
     } catch (EncodingException e) {
@@ -179,7 +179,7 @@
     try {
       return getAsync(face, interest).get();
     } catch (ExecutionException | InterruptedException e) {
-      logger.log(Level.WARNING, "Failed to retrieve data.", e);
+      logger.log(Level.FINE, "Failed to retrieve data.", e);
       throw new IOException("Failed to retrieve data.", e);
     }
   }
diff --git a/src/main/java/com/intel/jndn/utils/SimpleClient.java b/src/main/java/com/intel/jndn/utils/SimpleClient.java
index a751f8e..146391b 100644
--- a/src/main/java/com/intel/jndn/utils/SimpleClient.java
+++ b/src/main/java/com/intel/jndn/utils/SimpleClient.java
@@ -78,7 +78,7 @@
         }
       });
     } catch (IOException e) {
-      logger.log(Level.WARNING, "IO failure while sending interest: ", e);
+      logger.log(Level.FINE, "IO failure while sending interest: ", e);
       futureData.reject(e);
     }
 
@@ -112,7 +112,7 @@
     try {
       return getAsync(face, interest).get();
     } catch (ExecutionException | InterruptedException e) {
-      logger.log(Level.WARNING, "Failed to retrieve data.", e);
+      logger.log(Level.FINE, "Failed to retrieve data.", e);
       throw new IOException("Failed to retrieve data.", e);
     }
   }
