Hotfix: Added check for existence of #bundle value before checking if #bundle is equal to 'event'