Move 'NeoBundleCheck' into if-block