diff --git a/test/views/inbox_view_test.js b/test/views/inbox_view_test.js
index dea936399..c16b24ef4 100644
--- a/test/views/inbox_view_test.js
+++ b/test/views/inbox_view_test.js
@@ -22,6 +22,7 @@ describe('InboxView', () => {
       textsecure.storage.user.getNumber(),
       'private'
     );
+    window.getOurDisplayName = () => 'display name test';
     inboxView = new Whisper.InboxView({
       model: {},
       window,
diff --git a/ts/components/Avatar.tsx b/ts/components/Avatar.tsx
index 4c85c5e65..28762e5e0 100644
--- a/ts/components/Avatar.tsx
+++ b/ts/components/Avatar.tsx
@@ -51,7 +51,8 @@ export class Avatar extends React.PureComponent<Props, State> {
     const { phoneNumber, size, name, profileName } = this.props;
 
     if (!phoneNumber) {
-      throw new Error('Empty phoneNumber for identifcon');
+      window.log.error('Empty phoneNumber for identicon');
+      return <></>;
     }
 
     const userName = profileName || name;