diff --git a/modules/flag/flag.module b/modules/flag/flag.module
index bca0b47..6ed8615 100644
--- a/modules/flag/flag.module
+++ b/modules/flag/flag.module
@@ -1916,6 +1916,10 @@ function flag_get_flags($entity_type = NULL, $content_subtype = NULL, $account =
       ->execute();
     foreach ($result as $row) {
       if (!isset($flags[$row->name])) {
+        $options = (array) unserialize($row->options);
+        if (!is_array($options)) {
+          watchdog('flag-issue-1925922', '$options in flag_get_flags() at line 1919 is not a serialized array.', WATCHDOG_EMERGENCY);
+        }
         $flags[$row->name] = flag_flag::factory_by_row($row);
       }
       else {
diff --git a/modules/flag/includes/flag/flag_flag.inc b/modules/flag/includes/flag/flag_flag.inc
index 7adc458..12e3733 100644
--- a/modules/flag/includes/flag/flag_flag.inc
+++ b/modules/flag/includes/flag/flag_flag.inc
@@ -129,6 +129,9 @@ class flag_flag {
 
     // Populate the options with the defaults.
     $options = (array) unserialize($row->options);
+    if (!is_array($options)) {
+      watchdog('flag-issue-1925922', '$options in factory_by_row() at line 131 is not an array.', array(), WATCHDOG_EMERGENCY);
+    }
     $options += $flag->options();
 
     // Make the unserialized options accessible as normal properties.
@@ -201,9 +204,15 @@ class flag_flag {
     // Merge in options from the current link type.
     $link_type = $this->get_link_type();
     $options = array_merge($options, $link_type['options']);
+    if (!is_array($options)) {
+      watchdog('flag-issue-1925922', '$options in options() at line 206 is not an array.', array(), WATCHDOG_EMERGENCY);
+    }
 
     // Allow other modules to change the flag options.
     drupal_alter('flag_options', $options, $this);
+    if (!is_array($options)) {
+      watchdog('flag-issue-1925922', '$options in options() at line 212 is not an array.', array(), WATCHDOG_EMERGENCY);
+    }
     return $options;
   }
   /**