diff --git a/lib/Models/NewsletterOption.php b/lib/Models/NewsletterOption.php
index d355c1ead2..1ac8759bbc 100644
--- a/lib/Models/NewsletterOption.php
+++ b/lib/Models/NewsletterOption.php
@@ -7,7 +7,7 @@ class NewsletterOption extends Model {
   public static $_table = MP_NEWSLETTER_OPTION_TABLE;
 
   static function createOrUpdate($data = array()) {
-    if(!is_array($data) && empty($data)) return;
+    if(!is_array($data) || empty($data['newsletter_id']) || empty($data['option_field_id'])) return;
 
     $newsletter_option = self::where('option_field_id', $data['option_field_id'])
       ->where('newsletter_id', $data['newsletter_id'])