diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index 90e3a63c53d..107bc4cf4d8 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -505,6 +505,8 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
 	int return_code = theNdb->receiveResponse(WAITFOR_SCAN_TIMEOUT);
 	if (return_code == 0 && seq == tp->getNodeSequence(nodeId)) {
 	  continue;
+	} else if(return_code == -1){
+	  retVal = -1;
 	} else {
 	  idx = last;
 	  retVal = -2; //return_code;
@@ -1377,7 +1379,11 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed,
 	    continue;
 	  }
 	  if(DEBUG_NEXT_RESULT) ndbout_c("return -1");
-	  setErrorCode(4028);
+	  if(return_code == -1){
+	    setErrorCode(4008);
+	  } else {
+	    setErrorCode(4028);
+	  }
 	  return -1;
 	}