Merge "Add an automated test for the null bundle crash."