--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c	Fri Jun 02 12:31:28 2017 +0530
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c	Tue May 16 10:52:30 2017 +0200
@@ -2421,7 +2421,6 @@
     /* Check data structure */
     data = (ClassInstancesData*)user_data;
     if (data == NULL) {
-        data->error = AGENT_ERROR_ILLEGAL_ARGUMENT;
         return JVMTI_VISIT_ABORT;
     }
 
@@ -2540,7 +2539,6 @@
     /* Check data structure */
     data = (ClassCountData*)user_data;
     if (data == NULL) {
-        data->error = AGENT_ERROR_ILLEGAL_ARGUMENT;
         return JVMTI_VISIT_ABORT;
     }
 
@@ -2598,7 +2596,6 @@
     /* Check data structure */
     data = (ClassCountData*)user_data;
     if (data == NULL) {
-        data->error = AGENT_ERROR_ILLEGAL_ARGUMENT;
         return JVMTI_VISIT_ABORT;
     }
 
@@ -2757,7 +2754,6 @@
     /* Check data structure */
     data = (ReferrerData*)user_data;
     if (data == NULL) {
-        data->error = AGENT_ERROR_ILLEGAL_ARGUMENT;
         return JVMTI_VISIT_ABORT;
     }