diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java
index 005bc3a5bb..28b933d46c 100644
--- a/src/java/voldemort/client/protocol/admin/AdminClient.java
+++ b/src/java/voldemort/client/protocol/admin/AdminClient.java
@@ -2154,7 +2154,6 @@ public Iterator<QueryKeyResult> queryKeys(int nodeId,
                 store = adminStoreClient.getSocketStore(nodeId, storeName);
 
             } catch(Exception e) {
-                AdminClient.this.close();
                 throw new VoldemortException(e);
             }
 
@@ -2165,7 +2164,6 @@ public QueryKeyResult computeNext() {
                     ByteArray key;
                     List<Versioned<byte[]>> value = null;
                     if(!keys.hasNext()) {
-                        AdminClient.this.close();
                         return endOfData();
                     } else {
                         key = keys.next();
diff --git a/test/unit/voldemort/client/AdminServiceBasicTest.java b/test/unit/voldemort/client/AdminServiceBasicTest.java
index deb5d7d96a..1da3a7db89 100644
--- a/test/unit/voldemort/client/AdminServiceBasicTest.java
+++ b/test/unit/voldemort/client/AdminServiceBasicTest.java
@@ -1437,6 +1437,8 @@ public void testQuery() {
         entry = results.next();
         assertFalse("There should not be more results", results.hasNext());
         assertEquals("Not the right key", queryKeys.get(0), entry.getKey());
+        assertFalse("There should not be exception", entry.hasException());
+        assertTrue("There should be values", entry.hasValues());
         assertNotNull("Response should be non-null", entry.getValues());
         assertEquals("Value should be empty list", 0, entry.getValues().size());
         assertNull("There should not be exception", entry.getException());
@@ -1449,6 +1451,8 @@ public void testQuery() {
         entry = results.next();
         assertFalse("There should not be more results", results.hasNext());
         assertEquals("Not the right key", queryKeys.get(0), entry.getKey());
+        assertTrue("There should be exception", entry.hasException());
+        assertFalse("There should not be values", entry.hasValues());
         assertNull("Value should be null", entry.getValues());
         assertTrue("There should be InvalidMetadataException exception",
                    entry.getException() instanceof InvalidMetadataException);
@@ -1461,6 +1465,8 @@ public void testQuery() {
         entry = results.next();
         assertFalse("There should not be more results", results.hasNext());
         assertEquals("Not the right key", queryKeys.get(0), entry.getKey());
+        assertTrue("There should be exception", entry.hasException());
+        assertFalse("There should not be values", entry.hasValues());
         assertNull("Value should be null", entry.getValues());
         assertTrue("There should be InvalidMetadataException exception",
                    entry.getException() instanceof InvalidMetadataException);
@@ -1473,9 +1479,10 @@ public void testQuery() {
         assertTrue("Results should not be empty", results.hasNext());
         entry = results.next();
         assertFalse("There should not be more results", results.hasNext());
+        assertFalse("There should not be exception", entry.hasException());
+        assertTrue("There should be values", entry.hasValues());
         assertEquals("Not the right key", queryKeys.get(0), entry.getKey());
         assertEquals("Value should be empty list", 0, entry.getValues().size());
-        assertNull("There should not be exception", entry.getException());
 
         // test empty request
         queryKeys = new ArrayList<ByteArray>();
@@ -1490,6 +1497,8 @@ public void testQuery() {
         assertTrue("Results should not be empty", results.hasNext());
         entry = results.next();
         assertFalse("There should not be more results", results.hasNext());
+        assertTrue("There should be exception", entry.hasException());
+        assertFalse("There should not be values", entry.hasValues());
         assertNull("Value should be null", entry.getValues());
         assertTrue("There should be IllegalArgumentException exception",
                    entry.getException() instanceof IllegalArgumentException);