diff --git a/lib/Form/Block/Select.php b/lib/Form/Block/Select.php
index e7bf09e05a..1a008b1463 100644
--- a/lib/Form/Block/Select.php
+++ b/lib/Form/Block/Select.php
@@ -53,7 +53,7 @@ class Select {
       }
       $html .= '<option value="" disabled selected hidden>' . $label . '</option>';
     } else {
-      if (empty($block['params']['required']) || !$block['params']['required']) {
+      if (empty($block['params']['required'])) {
         $html .= '<option value="">-</option>';
       }
     }
diff --git a/lib/Models/Model.php b/lib/Models/Model.php
index e60c27017d..80e1f00c95 100644
--- a/lib/Models/Model.php
+++ b/lib/Models/Model.php
@@ -179,7 +179,7 @@ class Model extends \MailPoetVendor\Sudzy\ValidModel {
           $model = $model->where($field, $value);
         }
       }
-      if ($model) $model = $model->findOne();
+      if ($model !== false) $model = $model->findOne();
     }
 
     if ($model === false) {
diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php
index c92ef091ab..e19166b102 100644
--- a/lib/Newsletter/Renderer/Renderer.php
+++ b/lib/Newsletter/Renderer/Renderer.php
@@ -4,6 +4,7 @@ namespace MailPoet\Newsletter\Renderer;
 
 use MailPoet\Config\Env;
 use MailPoet\Entities\NewsletterEntity;
+use MailPoet\InvalidStateException;
 use MailPoet\Models\Newsletter;
 use MailPoet\Newsletter\NewslettersRepository;
 use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper;
@@ -63,11 +64,13 @@ class Renderer {
    * @return NewsletterEntity|null
    */
   private function getNewsletter($newsletter) {
-    if ($newsletter instanceof NewsletterEntity) return $newsletter;
     if ($newsletter instanceof Newsletter) {
-      $newsletterId = $newsletter->id;
+      return $this->newslettersRepository->findOneById($newsletter->id);
     }
-    return $this->newslettersRepository->findOneById($newsletterId);
+    if (!$newsletter instanceof NewsletterEntity) {
+      throw new InvalidStateException();
+    }
+    return $newsletter;
   }
 
   public function render($newsletter, SendingTask $sendingTask = null, $type = false) {