Merge change 25532

* changes:
  Don't throw OutOfMemoryError if it's already been thrown.