diff --git a/src/Analytics.js b/src/Analytics.js
index d48372afd7..8b55bdfd64 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -190,6 +190,7 @@ class Analytics {
     }
 
     _setVisitVariable(key, value) {
+        if (this.disabled) return;
         this._paq.push(['setCustomVariable', customVariables[key].id, key, value, 'visit']);
     }
 
@@ -199,8 +200,8 @@ class Analytics {
         const config = SdkConfig.get();
         if (!config.piwik) return;
 
-        const whitelistedHSUrls = config.piwik.whitelistedHSUrls;
-        const whitelistedISUrls = config.piwik.whitelistedISUrls;
+        const whitelistedHSUrls = config.piwik.whitelistedHSUrls || [];
+        const whitelistedISUrls = config.piwik.whitelistedISUrls || [];
 
         this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
         this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 92baecb787..1eb96c9f11 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -352,7 +352,7 @@ export default React.createClass({
                     defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
                 });
             }).catch((e) => {
-                console.error(`Error attempting to load session: ${e}`);
+                console.error('Error attempting to load session', e);
                 return false;
             }).then((loadedSession) => {
                 if (!loadedSession) {