Updated error handling and bundle name