--- old/src/share/vm/services/diagnosticCommand.cpp	2017-03-06 16:36:57.864791949 -0800
+++ new/src/share/vm/services/diagnosticCommand.cpp	2017-03-06 16:36:57.788791725 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -423,8 +423,10 @@
 
   Klass* k = SystemDictionary::resolve_or_null(
     vmSymbols::finalizer_histogram_klass(), THREAD);
-  assert(k != NULL, "FinalizerHistogram class is not accessible");
-
+  if (k == NULL) {
+    output()->print_cr("FinalizerHistogram class is not accessible");
+    return;
+  }
   instanceKlassHandle klass(THREAD, k);
   JavaValue result(T_ARRAY);