--- a/hotspot/src/share/vm/ci/ciMethodData.hpp	Wed Nov 13 01:50:14 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciMethodData.hpp	Wed Nov 13 13:45:50 2013 +0100
@@ -77,7 +77,9 @@
   static ciKlass* valid_ciklass(intptr_t k) {
     if (!TypeEntries::is_type_none(k) &&
         !TypeEntries::is_type_unknown(k)) {
-      return (ciKlass*)TypeEntries::klass_part(k);
+      ciKlass* res = (ciKlass*)TypeEntries::klass_part(k);
+      assert(res != NULL, "invalid");
+      return res;
     } else {
       return NULL;
     }