*** old/src/share/vm/runtime/arguments.cpp	Thu Jan 24 16:52:10 2013
--- new/src/share/vm/runtime/arguments.cpp	Thu Jan 24 16:52:09 2013

*** 2456,2466 ****
--- 2456,2471 ----
        if (!add_property(tail)) {
          return JNI_ENOMEM;
        }
        // Out of the box management support
        if (match_option(option, "-Dcom.sun.management", &tail)) {
+ #if INCLUDE_MANAGEMENT
          FLAG_SET_CMDLINE(bool, ManagementServer, true);
+ #else
+         vm_exit_during_initialization(
+             "-Dcom.sun.management is not supported in this VM.", NULL);
+ #endif
        }
      // -Xint
      } else if (match_option(option, "-Xint", &tail)) {
            set_mode_flags(_int);
      // -Xmixed

*** 2805,2814 ****
--- 2810,2824 ----
      } else if (match_option(option, "-XX:+UseVMInterruptibleIO", &tail)) {
        // NOTE! In JDK 9, the UseVMInterruptibleIO flag will completely go
        //       away and will cause VM initialization failures!
        warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
        FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
+ #if !INCLUDE_MANAGEMENT
+     } else if (match_option(option, "-XX:+ManagementServer", &tail)) {
+       vm_exit_during_initialization(
+         "ManagementServer is not supported in this VM.", NULL);
+ #endif // INCLUDE_MANAGEMENT
      } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
        // Skip -XX:Flags= since that case has already been handled
        if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
          if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
            return JNI_EINVAL;