Bundle: Fixes null checks. (#1302)
Merge pull request #1303 from am11/master

Bundle: Fixes null checks (#1302)