Revert "Apply suggestions from code review"

This reverts commit e60fe99.

Author: HazAT

packages/browser/src/client.ts

@@ -3,7 +3,7 @@ import { DsnLike, Event, EventHint } from '@sentry/types';
 import { getGlobalObject, logger } from '@sentry/utils';
 
 import { BrowserBackend, BrowserOptions } from './backend';
-import { Breadcrumbs } from './integrations';
+import { Breadcrumbs } from './integrations/index';
 import { SDK_NAME, SDK_VERSION } from './version';
 
 /**
@@ -79,20 +79,22 @@ export class BrowserClient extends BaseClient<BrowserBackend, BrowserOptions> {
 
     this._processEvent(event, hint, scope)
       .then(finalEvent => {
-        // We need to check for finalEvent in case beforeSend returned null.
-        if (!finalEvent) {
-          return;
-        }
-        eventId = finalEvent.event_id;
+        // We need to check for finalEvent in case beforeSend returned null
+        eventId = finalEvent && finalEvent.event_id;
         // We do this here to not parse any requests if they are outgoing to Sentry
         // We log breadcrumbs if the integration has them enabled
-        const integration = this.getIntegration(Breadcrumbs);
-        if (integration) {
-          integration.addSentryBreadcrumb(finalEvent);
+        if (finalEvent) {
+          const integration = this.getIntegration(Breadcrumbs);
+          if (integration) {
+            integration.addSentryBreadcrumb(finalEvent);
+          }
         }
+        this._processing = false;
       })
-      .catch(reason => logger.error(reason))
-      .finally(() => (this._processing = false));
+      .then(null, reason => {
+        logger.error(reason);
+        this._processing = false;
+      });
 
     return eventId;
   }