diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
index c8232d71a6..6b5fc59ea5 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -3428,19 +3428,24 @@ final boolean doExecute() throws SQLServerException {
             }
         }
         finally {
-            if (integratedSecurity) {
-                if (null != authentication)
-                    authentication.ReleaseClientContext();
-                authentication = null;
-                
+            if (integratedSecurity) {                
                 if (null != ImpersonatedUserCred) {
                     try {
-                        ImpersonatedUserCred.dispose();
+                    	if (ImpersonatedUserCred.getRemainingLifetime() <= 0) {
+                            if (null != authentication)
+                                authentication.ReleaseClientContext();
+                            authentication = null;
+                    		ImpersonatedUserCred.dispose();
+                    	}
                     }
                     catch (GSSException e) {
                         if (connectionlogger.isLoggable(Level.FINER))
                             connectionlogger.finer(toString() + " Release of the credentials failed GSSException: " + e);
                     }
+                } else {
+                    if (null != authentication)
+                        authentication.ReleaseClientContext();
+                    authentication = null;
                 }
             }
         }
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java b/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java
index c942f8c9ad..b297a3924b 100644
--- a/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java
+++ b/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java
@@ -92,16 +92,16 @@ public static void compareExpectedAndActual(int dataType,
         else
             switch (dataType) {
                 case java.sql.Types.BIGINT:
-                    assertTrue((((Long) expectedValue).longValue() == ((Long) actualValue).longValue()), "Unexpected bigint value");
+                    assertTrue((((Long) expectedValue).longValue() == ((Long) actualValue).longValue()), "Unexpected bigint value. Expected:" + ((Long) expectedValue).longValue() + " Actual:" + ((Long) actualValue).longValue());
                     break;
 
                 case java.sql.Types.INTEGER:
-                    assertTrue((((Integer) expectedValue).intValue() == ((Integer) actualValue).intValue()), "Unexpected int value");
+                    assertTrue((((Integer) expectedValue).intValue() == ((Integer) actualValue).intValue()), "Unexpected int value. Expected:" + ((Integer) expectedValue).intValue() + " Actual:" + ((Integer) actualValue).intValue());
                     break;
 
                 case java.sql.Types.SMALLINT:
                 case java.sql.Types.TINYINT:
-                    assertTrue((((Short) expectedValue).shortValue() == ((Short) actualValue).shortValue()), "Unexpected smallint/tinyint value");
+                    assertTrue((((Short) expectedValue).shortValue() == ((Short) actualValue).shortValue()), "Unexpected smallint/tinyint value. Expected:" + ((Short) expectedValue).shortValue() + " Actual:" + ((Short) actualValue).shortValue());
                     break;
 
                 case java.sql.Types.BIT:
@@ -115,11 +115,11 @@ public static void compareExpectedAndActual(int dataType,
                     break;
 
                 case java.sql.Types.DOUBLE:
-                    assertTrue((((Double) expectedValue).doubleValue() == ((Double) actualValue).doubleValue()), "Unexpected float value");
+                    assertTrue((((Double) expectedValue).doubleValue() == ((Double) actualValue).doubleValue()), "Unexpected double value. Expected:" + ((Double) expectedValue).doubleValue() + " Actual:" + ((Double) actualValue).doubleValue());
                     break;
 
                 case java.sql.Types.REAL:
-                    assertTrue((((Float) expectedValue).floatValue() == ((Float) actualValue).floatValue()), "Unexpected real value");
+                    assertTrue((((Float) expectedValue).floatValue() == ((Float) actualValue).floatValue()), "Unexpected real/float value. Expected:" + ((Float) expectedValue).floatValue() + " Actual:" + ((Float) actualValue).floatValue());
                     break;
 
                 case java.sql.Types.VARCHAR: