diff --git a/lib/Newsletter/Shortcodes/Categories/Subscriber.php b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
index 9fc3de2c3e..27ec94a78f 100644
--- a/lib/Newsletter/Shortcodes/Categories/Subscriber.php
+++ b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
@@ -21,9 +21,9 @@ class Subscriber {
       '';
     switch($action) {
       case 'firstname':
-        return ($subscriber && !empty($subscriber->first_name)) ? $subscriber->first_name : $default_value;
+        return (!empty($subscriber->first_name)) ? $subscriber->first_name : $default_value;
       case 'lastname':
-        return ($subscriber && !empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
+        return (!empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
       case 'email':
         return ($subscriber) ? $subscriber->email : false;
       case 'displayname':
diff --git a/tests/unit/Newsletter/ShortcodesTest.php b/tests/unit/Newsletter/ShortcodesTest.php
index e2538122b3..61c26ca157 100644
--- a/tests/unit/Newsletter/ShortcodesTest.php
+++ b/tests/unit/Newsletter/ShortcodesTest.php
@@ -159,7 +159,7 @@ class ShortcodesTest extends MailPoetTest {
     expect($result[0])->false();
   }
 
-  function testSubscriberFirstAndLastNameShortcodesReturnDefaultValueWhenDataIsEpty() {
+  function testSubscriberFirstAndLastNameShortcodesReturnDefaultValueWhenDataIsEmpty() {
     // when subscriber exists but first or last names are empty, default value is returned
     $subscriber = $this->subscriber;
     $subscriber->first_name = '';