diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js
index d5b303b..3547d7f 100644
--- a/src/workers/CommandorPage.js
+++ b/src/workers/CommandorPage.js
@@ -123,7 +123,8 @@ class CommandorPage {
         const intervalTask = setInterval(() => {
             if (this.isTerminated) {
                 log(this.device.model() + ":request terminated, will close device");
-                this.context.close();
+                if (this.context !== undefined)
+                    this.context.close();
                 // this.page.close()
                 // this.device.close()
                 clearInterval(intervalTask)
@@ -201,10 +202,10 @@ class CommandorPage {
                 if (!this.isNameInput) {
                     await page.locator(LAST_NAME).focus()
                     await delay(getRandomWaitTime())
-                    await page.locator(LAST_NAME).fill(this.contact.firstName)
+                    await page.locator(LAST_NAME).fill(this.contact.lastName)
                     await page.locator(FIRST_NAME).focus()
                     await delay(getRandomWaitTime())
-                    await page.locator(FIRST_NAME).fill(this.contact.lastName)
+                    await page.locator(FIRST_NAME).fill(this.contact.firstName)
                     this.isNameInput = true
                 }
             }