diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/ActivityCorrelator.java b/src/main/java/com/microsoft/sqlserver/jdbc/ActivityCorrelator.java
index a9bfa6030..fe195632f 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/ActivityCorrelator.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/ActivityCorrelator.java
@@ -15,20 +15,20 @@
  */
 final class ActivityCorrelator {
 
-    private static ActivityId s_ActivityId;
+    private static ActivityId activityId;
     private static Lock lockObject = new ReentrantLock();
 
     // Get the current ActivityId in TLS
     static ActivityId getCurrent() {
-        if (s_ActivityId == null) {
+        if (activityId == null) {
             lockObject.lock();
-            if (s_ActivityId == null) {
-                s_ActivityId = new ActivityId();
+            if (activityId == null) {
+                activityId = new ActivityId();
             }
             lockObject.unlock();
         }
 
-        return s_ActivityId;
+        return activityId;
     }
 
     // Increment the Sequence number of the ActivityId in TLS
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
index d15b5beab..9d0548031 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
@@ -6876,7 +6876,7 @@ final boolean readPacket() throws SQLServerException {
             }
 
             // if messageType is RPC or QUERY, then increment Counter's state
-            if (tdsChannel.getWriter().checkIfTdsMessageTypeIsBatchOrRPC()) {
+            if (tdsChannel.getWriter().checkIfTdsMessageTypeIsBatchOrRPC() && null != command) {
                 command.getCounter().increaseCounter(packetLength);
             }
 
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
index facbb4d33..ec3e86c3c 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -3703,10 +3703,8 @@ void prelogin(String serverName, int portNumber) throws SQLServerException {
         Util.writeInt((int) seqNum, preloginRequest, offset);
         offset += 4;
 
-        if (Util.isActivityTraceOn()) {
-            if (connectionlogger.isLoggable(Level.FINER)) {
-                connectionlogger.finer(toString() + " ActivityId " + activityId.toString());
-            }
+        if (Util.isActivityTraceOn() && connectionlogger.isLoggable(Level.FINER)) {
+            connectionlogger.finer(toString() + " ActivityId " + activityId);
         }
 
         if (connectionlogger.isLoggable(Level.FINER)) {