diff --git a/runtime/compiler/optimizer/TreeLowering.cpp b/runtime/compiler/optimizer/TreeLowering.cpp
index 5e3205b2846..cde2292a655 100644
--- a/runtime/compiler/optimizer/TreeLowering.cpp
+++ b/runtime/compiler/optimizer/TreeLowering.cpp
@@ -885,6 +885,9 @@ static bool skipBoundChecks(TR::Compilation *comp, TR::Node *node)
  *
  Before:
  +----------------------------------------+
+ |NULLCHK                                 |
+ |   PassThrough                          |
+ |      ==>iRegLoad  (array address)      |
  |treetop                                 |
  |  acall  jitLoadFlattenableArrayElement |
  |     ==>iRegLoad                        |
@@ -895,15 +898,16 @@ static bool skipBoundChecks(TR::Compilation *comp, TR::Node *node)
  After:
  +------------------------------------------+
  |BBStart                                   |
- |treetop                                   |
- |   ==>iRegLoad                            |
+ |NULLCHK                                   |
+ |   PassThrough                            |
+ |      ==>iRegLoad (array address)         |
  |treetop                                   |
  |   ==>aRegLoad                            |
  |ificmpne ----->---------------------------+-----------+
  |   iand                                   |           |
  |      iloadi  <isClassFlags>              |           |
  |      ...                                 |           |
- |      iconst J9ClassIsPrimitiveValueType  |           |
+ |      iconst J9ClassArrayIsNullRestricted |           |
  |   iconst 0                               |           |
  |   GlRegDeps ()                           |           |
  |      ==>aRegLoad                         |           |
@@ -1215,6 +1219,9 @@ static bool skipArrayStoreChecks(TR::Compilation *comp, TR::Node *node)
  *
  Before:
  +-------------------------------------------+
+ |NULLCHK                                    |
+ |   PassThrough                             |
+ |      aload <ArrayAddress>                 |
  |treetop                                    |
  |   acall  jitStoreFlattenableArrayElement  |
  |      aload <value>                        |
@@ -1226,8 +1233,9 @@ static bool skipArrayStoreChecks(TR::Compilation *comp, TR::Node *node)
  After:
  +-------------------------------------------+
  |BBStart                                    |
- |treetop                                    |
- |   aload <ArrayAddress>                    |
+ |NULLCHK                                    |
+ |   PassThrough                             |
+ |      aload <ArrayAddress>                 |
  |treetop                                    |
  |   aload <index>                           |
  |treetop                                    |
@@ -1236,7 +1244,7 @@ static bool skipArrayStoreChecks(TR::Compilation *comp, TR::Node *node)
  |   iand                                    |               |
  |      iloadi  <isClassFlags>               |               |
  |      ...                                  |               |
- |      iconst J9ClassIsPrimitiveValueType   |               |
+ |      iconst J9ClassArrayIsNullRestricted  |               |
  |   iconst 0                                |               |
  |   GlRegDeps ()                            |               |
  |      PassThrough rcx                      |               |
@@ -1249,8 +1257,6 @@ static bool skipArrayStoreChecks(TR::Compilation *comp, TR::Node *node)
  +-------------------------------------------+               |
  +-------------------------------------------+               |
  |BBStart (extension of previous block)      |               |
- |NULLCHK on n82n [if required]              |               |
- |   ...                                     |               |
  |BNDCHK                                     |               |
  |   ...                                     |               |
  |treetop                                    |               |