diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index 4a4fd7b70..257986b69 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -72,6 +72,7 @@ export const IncomingCallDialog = () => {
   if (!hasIncomingCall || !incomingCallFromPubkey) {
     return null;
   }
+  // #endregion
 
   if (hasIncomingCall) {
     return (
diff --git a/ts/test/session/unit/onboarding/Onboarding_test.ts b/ts/test/session/unit/onboarding/Onboarding_test.ts
index 9eb152c17..18d99d1c3 100644
--- a/ts/test/session/unit/onboarding/Onboarding_test.ts
+++ b/ts/test/session/unit/onboarding/Onboarding_test.ts
@@ -12,6 +12,8 @@ import { TestUtils } from '../../../test-utils';
 import { stubWindow } from '../../../test-utils/utils';
 
 describe('Onboarding', () => {
+  const polledDisplayName = 'Hello World';
+
   beforeEach(() => {
     TestUtils.stubWindowLog();
     TestUtils.stubWindowWhisper();
@@ -20,6 +22,7 @@ describe('Onboarding', () => {
     TestUtils.stubData('createOrUpdateItem').resolves();
     TestUtils.stubData('removeItemById').resolves();
     stubWindow('setOpengroupPruning', () => {});
+    Sinon.stub(getSwarmPollingInstance(), 'pollOnceForOurDisplayName').resolves(polledDisplayName);
   });
 
   afterEach(() => {
@@ -83,7 +86,7 @@ describe('Onboarding', () => {
       } catch (error) {
         error.should.be.an.instanceOf(Error);
         error.message.should.equal(
-          'Session always need a mnemonic. Either generated or given by the user'
+          'Session always needs a mnemonic. Either generated or given by the user'
         );
       }
     });
@@ -112,14 +115,9 @@ describe('Onboarding', () => {
   });
 
   describe('signInByLinkingDevice', () => {
-    const polledDisplayName = 'Hello World';
-    Sinon.stub(getSwarmPollingInstance(), 'pollOnceForOurDisplayName').resolves(polledDisplayName);
-
     const abortController = new AbortController();
 
     it('should return a valid pubkey/account id and display name given a valid recovery password', async () => {
-      // TODO[epic=ses-1560]  still needs stubbing to pass tests and it error conditions
-      // TODO[epic=ses-1560] remember to stub polling
       const recoveryPassword = await generateMnemonic();
       const { displayName, pubKeyString } = await signInByLinkingDevice(
         recoveryPassword,
@@ -133,5 +131,24 @@ describe('Onboarding', () => {
       expect(displayName, 'should be a string').to.be.a('string');
       expect(displayName, `should equal ${polledDisplayName}`).to.equal(polledDisplayName);
     });
+    it('should throw an error if the recovery password is empty', async () => {
+      try {
+        await signInByLinkingDevice('', 'english', abortController.signal);
+      } catch (error) {
+        error.should.be.an.instanceOf(Error);
+        error.message.should.equal(
+          'Session always needs a mnemonic. Either generated or given by the user'
+        );
+      }
+    });
+    it('should throw an error if the mnemonicLanguage is empty', async () => {
+      try {
+        const recoveryPassword = await generateMnemonic();
+        await signInByLinkingDevice(recoveryPassword, '', abortController.signal);
+      } catch (error) {
+        error.should.be.an.instanceOf(Error);
+        error.message.should.equal('We always need a mnemonicLanguage');
+      }
+    });
   });
 });
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index a5eb5e42c..3a4cbf056 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -69,7 +69,7 @@ export async function registerSingleDevice(
   registerCallback?: (pubkey: string) => Promise<void>
 ) {
   if (isEmpty(generatedMnemonic)) {
-    throw new Error('Session always need a mnemonic. Either generated or given by the user');
+    throw new Error('Session always needs a mnemonic. Either generated or given by the user');
   }
   if (isEmpty(mnemonicLanguage)) {
     throw new Error('We always need a mnemonicLanguage');
@@ -112,7 +112,7 @@ export async function signInByLinkingDevice(
     throw new Error('Session always needs a mnemonic. Either generated or given by the user');
   }
   if (isEmpty(mnemonicLanguage)) {
-    throw new Error('We always needs a mnemonicLanguage');
+    throw new Error('We always need a mnemonicLanguage');
   }
 
   const identityKeyPair = await generateKeypair(mnemonic, mnemonicLanguage);