*** old/src/share/vm/prims/whitebox.cpp	Thu Jan 21 19:08:31 2016
--- new/src/share/vm/prims/whitebox.cpp	Thu Jan 21 19:08:31 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2012, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 1405,1415 ****
--- 1405,1415 ----
  
    Klass* res = ik->find_field(name_symbol, signature_symbol, &fd);
    if (res == NULL) {
      tty->print_cr("Invalid layout of %s at %s", ik->external_name(),
          name_symbol->as_C_string());
!     vm_exit_during_initialization("Invalid layout of preloaded class: use -XX:+TraceClassLoading to see the origin of the problem class");
!     vm_exit_during_initialization("Invalid layout of preloaded class: use -Xlog:classload=info to see the origin of the problem class");
    }
  
    //fetch the field at the offset we've found
    int dest_offset = fd.offset();