diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
index 1aa72fb..f40ae06 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
@@ -210,7 +210,12 @@
                 }
             }
             int retry = 5;
+
             do {
+                if (vv == null) {
+                    log.error("Shouldn't reach here - value is null");
+                    break;
+                }
                 ByteBuffer prev = ByteBuffer.wrap(vv.value());
                 long next = prev.getLong() + 1;
                 byte[] newValue = ByteBuffer.allocate(Long.BYTES).putLong(next).array();
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
index 3dd93b9..f8c1be8 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
@@ -94,6 +94,9 @@
     }
 
     @Override
+//    @edu.umd.cs.findbugs.annotations.SuppressWarnings
+//            (value="NP_NONNULL_PARAM_VIOLATION",
+//             justification="False positives on completedFuture call, passing null as a parameter is allowed")
     public synchronized CompletableFuture<Void> connect() {
         if (remoteNode != null) {
             // done