--- old/src/share/vm/prims/whitebox.cpp	2017-03-03 16:29:30.898216902 +0300
+++ new/src/share/vm/prims/whitebox.cpp	2017-03-03 16:29:30.778216907 +0300
@@ -365,7 +365,7 @@
     const HeapRegion* hr = g1->heap_region_containing(result);
     return hr->is_humongous();
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1IsHumongous: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1IsHumongous: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jboolean, WB_G1BelongsToHumongousRegion(JNIEnv* env, jobject o, jlong addr))
@@ -374,7 +374,7 @@
     const HeapRegion* hr = g1->heap_region_containing((void*) addr);
     return hr->is_humongous();
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1BelongsToHumongousRegion: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1BelongsToHumongousRegion: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jboolean, WB_G1BelongsToFreeRegion(JNIEnv* env, jobject o, jlong addr))
@@ -383,7 +383,7 @@
     const HeapRegion* hr = g1->heap_region_containing((void*) addr);
     return hr->is_free();
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1BelongsToFreeRegion: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1BelongsToFreeRegion: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jlong, WB_G1NumMaxRegions(JNIEnv* env, jobject o))
@@ -392,7 +392,7 @@
     size_t nr = g1->max_regions();
     return (jlong)nr;
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1NumMaxRegions: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1NumMaxRegions: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jlong, WB_G1NumFreeRegions(JNIEnv* env, jobject o))
@@ -401,7 +401,7 @@
     size_t nr = g1->num_free_regions();
     return (jlong)nr;
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1NumFreeRegions: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1NumFreeRegions: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jboolean, WB_G1InConcurrentMark(JNIEnv* env, jobject o))
@@ -409,7 +409,7 @@
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
     return g1h->concurrent_mark()->cmThread()->during_cycle();
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1InConcurrentMark: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1InConcurrentMark: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jboolean, WB_G1StartMarkCycle(JNIEnv* env, jobject o))
@@ -421,14 +421,14 @@
     }
     return false;
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1StartMarkCycle: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1StartMarkCycle: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jint, WB_G1RegionSize(JNIEnv* env, jobject o))
   if (UseG1GC) {
     return (jint)HeapRegion::GrainBytes;
   }
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1RegionSize: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1RegionSize: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jlong, WB_PSVirtualSpaceAlignment(JNIEnv* env, jobject o))
@@ -437,7 +437,7 @@
     return ParallelScavengeHeap::heap()->gens()->virtual_spaces()->alignment();
   }
 #endif // INCLUDE_ALL_GCS
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_PSVirtualSpaceAlignment: Parallel GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_PSVirtualSpaceAlignment: Parallel GC is not enabled");
 WB_END
 
 WB_ENTRY(jlong, WB_PSHeapGenerationAlignment(JNIEnv* env, jobject o))
@@ -446,7 +446,7 @@
     return ParallelScavengeHeap::heap()->generation_alignment();
   }
 #endif // INCLUDE_ALL_GCS
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_PSHeapGenerationAlignment: Parallel GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_PSHeapGenerationAlignment: Parallel GC is not enabled");
 WB_END
 
 WB_ENTRY(jobject, WB_G1AuxiliaryMemoryUsage(JNIEnv* env))
@@ -459,7 +459,7 @@
     return JNIHandles::make_local(env, h());
   }
 #endif // INCLUDE_ALL_GCS
-  THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
+  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
 WB_END
 
 class OldRegionsLivenessClosure: public HeapRegionClosure {
@@ -504,7 +504,7 @@
 
 WB_ENTRY(jlongArray, WB_G1GetMixedGCInfo(JNIEnv* env, jobject o, jint liveness))
   if (!UseG1GC) {
-    THROW_MSG_NULL(vmSymbols::java_lang_RuntimeException(), "WB_G1GetMixedGCInfo: G1 GC is not enabled");
+    THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1GetMixedGCInfo: G1 GC is not enabled");
   }
   if (liveness < 0) {
     THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "liveness value should be non-negative");