diff --git a/db/migrate/20150712000001_update_setting.rb b/db/migrate/20150712000001_update_setting.rb
index 1e1b2f4d6..fa9d50478 100644
--- a/db/migrate/20150712000001_update_setting.rb
+++ b/db/migrate/20150712000001_update_setting.rb
@@ -2,6 +2,7 @@ class UpdateSetting < ActiveRecord::Migration
   def up
     %w(product_name product_logo organization).each {|setting_name|
       setting = Setting.find_by(name: setting_name)
+      next if !setting
       setting.area = 'System::Branding'
       setting.save
     }