Merge "Prevent crashes if boot images fail to load"