diff --git a/src/__tests__/connection/enterprise/__snapshots__/hrd_screen.test.js.snap b/src/__tests__/connection/enterprise/__snapshots__/hrd_screen.test.js.snap
index 1bee2f3b4..9a6cca6c9 100644
--- a/src/__tests__/connection/enterprise/__snapshots__/hrd_screen.test.js.snap
+++ b/src/__tests__/connection/enterprise/__snapshots__/hrd_screen.test.js.snap
@@ -1,5 +1,92 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`HRDScreen Component renders correctly when enterprise domain is a whitespace string 1`] = `
+<div
+  data-__type="hrd_pane"
+  data-header={
+    <p>
+      Login with your corporate credentials. []
+    </p>
+  }
+  data-i18n={
+    {
+      "str": [Function],
+    }
+  }
+  data-model={
+    Immutable.Map {
+      "id": "__lock-id__",
+      "i18n": Immutable.Map {
+        "strings": Immutable.Map {
+          "enterpriseLoginIntructions": "Login with your corporate credentials.",
+          "enterpriseActiveLoginInstructions": "Please enter your corporate credentials at %s.",
+        },
+      },
+    }
+  }
+  data-passwordInputPlaceholder=" []"
+  data-usernameInputPlaceholder=" []"
+/>
+`;
+
+exports[`HRDScreen Component renders correctly when enterprise domain is an empty string 1`] = `
+<div
+  data-__type="hrd_pane"
+  data-header={
+    <p>
+      Login with your corporate credentials. []
+    </p>
+  }
+  data-i18n={
+    {
+      "str": [Function],
+    }
+  }
+  data-model={
+    Immutable.Map {
+      "id": "__lock-id__",
+      "i18n": Immutable.Map {
+        "strings": Immutable.Map {
+          "enterpriseLoginIntructions": "Login with your corporate credentials.",
+          "enterpriseActiveLoginInstructions": "Please enter your corporate credentials at %s.",
+        },
+      },
+    }
+  }
+  data-passwordInputPlaceholder=" []"
+  data-usernameInputPlaceholder=" []"
+/>
+`;
+
+exports[`HRDScreen Component renders correctly when enterprise domain is undefined 1`] = `
+<div
+  data-__type="hrd_pane"
+  data-header={
+    <p>
+      Login with your corporate credentials. []
+    </p>
+  }
+  data-i18n={
+    {
+      "str": [Function],
+    }
+  }
+  data-model={
+    Immutable.Map {
+      "id": "__lock-id__",
+      "i18n": Immutable.Map {
+        "strings": Immutable.Map {
+          "enterpriseLoginIntructions": "Login with your corporate credentials.",
+          "enterpriseActiveLoginInstructions": "Please enter your corporate credentials at %s.",
+        },
+      },
+    }
+  }
+  data-passwordInputPlaceholder=" []"
+  data-usernameInputPlaceholder=" []"
+/>
+`;
+
 exports[`HRDScreen Component renders correctly when there is an enterprise domain 1`] = `
 <div
   data-__type="hrd_pane"
diff --git a/src/__tests__/connection/enterprise/hrd_screen.test.js b/src/__tests__/connection/enterprise/hrd_screen.test.js
index 00c1ea18f..c48fcf6d2 100644
--- a/src/__tests__/connection/enterprise/hrd_screen.test.js
+++ b/src/__tests__/connection/enterprise/hrd_screen.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { mockComponent, expectComponent } from 'testUtils';
+import { mockComponent, expectComponent, renderShallowComponent } from 'testUtils';
 import I from 'immutable';
 import { dataFns } from '../../../utils/data_utils';
 import * as i18n from '../../../i18n';
@@ -49,4 +49,38 @@ describe('HRDScreen Component', () => {
     const Component = getComponent();
     expectComponent(<Component model={lock} i18n={i18nProp} />).toMatchSnapshot();
   });
+
+  it('renders correctly when enterprise domain is an empty string', () => {
+    require('connection/enterprise').enterpriseDomain.mockImplementation(() => '');
+    const Component = getComponent();
+    expectComponent(<Component model={lock} i18n={i18nProp} />).toMatchSnapshot();
+  });
+
+  it('renders correctly when enterprise domain is a whitespace string', () => {
+    require('connection/enterprise').enterpriseDomain.mockImplementation(() => '   ');
+    const Component = getComponent();
+    expectComponent(<Component model={lock} i18n={i18nProp} />).toMatchSnapshot();
+  });
+
+  it('renders correctly when enterprise domain is undefined', () => {
+    require('connection/enterprise').enterpriseDomain.mockImplementation(() => undefined);
+    const Component = getComponent();
+    expectComponent(<Component model={lock} i18n={i18nProp} />).toMatchSnapshot();
+  });
+
+  it('does not show "undefined" in message when enterprise domain is undefined', () => {
+    require('connection/enterprise').enterpriseDomain.mockImplementation(() => undefined);
+    const Component = getComponent();
+    const rendered = renderShallowComponent(<Component model={lock} i18n={i18nProp} />);
+    const headerText = rendered.props.header && rendered.props.header.props.children;
+    expect(String(headerText)).not.toContain('undefined');
+  });
+
+  it('does not show "undefined" in message when enterprise domain is null', () => {
+    require('connection/enterprise').enterpriseDomain.mockImplementation(() => null);
+    const Component = getComponent();
+    const rendered = renderShallowComponent(<Component model={lock} i18n={i18nProp} />);
+    const headerText = rendered.props.header && rendered.props.header.props.children;
+    expect(String(headerText)).not.toContain('undefined');
+  });
 });
diff --git a/src/__tests__/connection/enterprise/matchConnection.test.js b/src/__tests__/connection/enterprise/matchConnection.test.js
new file mode 100644
index 000000000..9683397ee
--- /dev/null
+++ b/src/__tests__/connection/enterprise/matchConnection.test.js
@@ -0,0 +1,39 @@
+import I from 'immutable';
+import { matchConnection } from '../../../connection/enterprise';
+
+// Build a minimal lock model with enterprise connections at the path
+// l.connections() calls tget(m, ['connections', type]) where tget uses
+// dataFns(['core']).tget, which reads m.getIn(['core', 'transient', 'connections', type])
+const buildModel = (connections) =>
+  I.fromJS({ core: { transient: { connections: { enterprise: connections } } } });
+
+describe('matchConnection', () => {
+  it('returns the matching connection when domains contains the email domain', () => {
+    const model = buildModel([
+      { name: 'my-connection', strategy: 'waad', domains: ['example.com'] }
+    ]);
+    const result = matchConnection(model, 'user@example.com');
+    expect(result).toBeDefined();
+    expect(result.get('name')).toBe('my-connection');
+  });
+
+  it('returns undefined when no connection matches the email domain', () => {
+    const model = buildModel([
+      { name: 'my-connection', strategy: 'waad', domains: ['other.com'] }
+    ]);
+    expect(matchConnection(model, 'user@example.com')).toBeUndefined();
+  });
+
+  it('does not throw when a connection has null domains', () => {
+    const model = buildModel([{ name: 'no-domains', strategy: 'waad', domains: null }]);
+    expect(() => matchConnection(model, 'user@example.com')).not.toThrow();
+    expect(matchConnection(model, 'user@example.com')).toBeUndefined();
+  });
+
+  it('returns false when email has no domain part', () => {
+    const model = buildModel([
+      { name: 'my-connection', strategy: 'waad', domains: ['example.com'] }
+    ]);
+    expect(matchConnection(model, 'notanemail')).toBe(false);
+  });
+});
diff --git a/src/connection/enterprise.js b/src/connection/enterprise.js
index be15a3b76..16629b0d9 100644
--- a/src/connection/enterprise.js
+++ b/src/connection/enterprise.js
@@ -79,7 +79,7 @@ export function matchConnection(m, email, strategies = []) {
   const target = emailDomain(email);
   if (!target) return false;
   return l.connections(m, 'enterprise', ...strategies).find(x => {
-    return x.get('domains').contains(target);
+    return x.get('domains') && x.get('domains').contains(target);
   });
 }
 
@@ -108,7 +108,7 @@ export function isADEnabled(m) {
 
 export function findADConnectionWithoutDomain(m, name = undefined) {
   return l.connections(m, 'enterprise', 'ad', 'auth0-adldap').find(x => {
-    return x.get('domains').isEmpty() && (!name || x.get('name') === name);
+    return x.get('domains') && x.get('domains').isEmpty() && (!name || x.get('name') === name);
   });
 }
 
diff --git a/src/connection/enterprise/hrd_screen.jsx b/src/connection/enterprise/hrd_screen.jsx
index 2eeb09b32..2a6df2ab2 100644
--- a/src/connection/enterprise/hrd_screen.jsx
+++ b/src/connection/enterprise/hrd_screen.jsx
@@ -11,7 +11,7 @@ const Component = ({ i18n, model }) => {
 
   var headerText;
 
-  if (domain !== null) {
+  if (domain && domain.trim()) {
     headerText = i18n.str('enterpriseActiveLoginInstructions', domain);
   } else {
     headerText = i18n.str('enterpriseLoginIntructions');