Bundle: Fixes null checks (#1302)

Fixes #1302.