diff --git a/library/src/main/java/org/apache/apex/malhar/lib/utils/PubSubHelper.java b/library/src/main/java/org/apache/apex/malhar/lib/utils/PubSubHelper.java
index 51eaeee..439a53b 100644
--- a/library/src/main/java/org/apache/apex/malhar/lib/utils/PubSubHelper.java
+++ b/library/src/main/java/org/apache/apex/malhar/lib/utils/PubSubHelper.java
@@ -24,6 +24,8 @@
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceStability;
 
+import com.google.common.base.Preconditions;
+
 import com.datatorrent.api.Context;
 
 @InterfaceStability.Evolving
@@ -57,9 +59,7 @@
 
   public static URI getURI(String address, boolean useSSL)
   {
-    if (address == null) {
-      throw new NullPointerException("No address specified");
-    }
+    Preconditions.checkNotNull(address,"No address specified");
     String uri = (useSSL ? "wss://" : "ws://") + address + "/pubsub";
     logger.debug("PubSub uri {}", uri);
     return URI.create(uri);
diff --git a/library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java b/library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java
index bd8b4a7..e35d6b0 100644
--- a/library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java
+++ b/library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java
@@ -41,7 +41,7 @@
  */
 public class XmlParserApplicationTest
 {
-  public static int TupleCount;
+  public static volatile int TupleCount;
   public static com.datatorrent.lib.parser.XmlParserTest.EmployeeBean obj;
   @Test
   public void testApplication()