Bundle: Fixes null checks. (#1302)