Bundle: Fixes file name for update.
Null checks in file helpers.
Merge pull request #1249 from am11/master

Bundle: Fixes file name for update