diff --git a/packages/docusaurus/CHANGELOG.md b/packages/docusaurus/CHANGELOG.md
index f1a5d1cfce..6b46c75471 100644
--- a/packages/docusaurus/CHANGELOG.md
+++ b/packages/docusaurus/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Docusaurus 2 Changelog
 
+## Unreleased
+
+- Added Google analytics and Google gtag plugins.
+
 ## 2.0.0-alpha.19
 
 - Add a sensible default for browserslist config.
@@ -39,8 +43,6 @@ presets: [
 - Minify css for production build
 - Fix weird scrolling problem when navigating to a route with a `hash` location
 
-
-
 ## V2 Changelog
 
 ### `siteConfig.js` changes
diff --git a/packages/docusaurus/src/client/client-lifecycles-dispatcher.js b/packages/docusaurus/src/client/client-lifecycles-dispatcher.js
index 3d36d54a49..2dfa482c2b 100644
--- a/packages/docusaurus/src/client/client-lifecycles-dispatcher.js
+++ b/packages/docusaurus/src/client/client-lifecycles-dispatcher.js
@@ -10,7 +10,7 @@ import clientModules from '@generated/client-modules';
 function dispatchLifecycleAction(lifecycleAction, ...args) {
   clientModules.forEach(clientModule => {
     const mod = clientModule.__esModule ? clientModule.default : clientModule;
-    if (mod[lifecycleAction]) {
+    if (mod && mod[lifecycleAction]) {
       mod[lifecycleAction](...args);
     }
   });