diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
index 50b0e10c5..3a8b26b77 100644
--- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
+++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -825,9 +825,6 @@ private int startFetch()
             {
                 try
                 {
-                    // Read handle before closing
-                    this.dis.readInt();
-
                     close();
                 }
                 catch (IOException e)
@@ -889,7 +886,8 @@ else if (this.handle == 0)
             {
                 if (dataLen == 0)
                 {
-                    dataLen = dis.readInt(); // need to read addl int here ...
+                    // Read handle before closing
+                    dis.readInt();
                     close();
                     return 0;
                 }