diff --git a/migrations/114_site_blackbox_whitelist.rb b/migrations/114_site_blackbox_whitelist.rb
new file mode 100644
index 00000000..cbce4d7b
--- /dev/null
+++ b/migrations/114_site_blackbox_whitelist.rb
@@ -0,0 +1,9 @@
+Sequel.migration do
+  up {
+    DB.add_column :sites, :blackbox_whitelisted, :boolean, default: false
+  }
+
+  down {
+    DB.drop_column :sites, :blackbox_whitelisted
+  }
+end
diff --git a/models/site.rb b/models/site.rb
index bb636223..181a3691 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1684,7 +1684,10 @@ class Site < Sequel::Model
     end
 
     if pathname.extname.match(HTML_REGEX) && defined?(BlackBox)
-      BlackBox.tos_violation_check self, uploaded
+      begin
+        BlackBox.tos_violation_check self, uploaded
+      rescue
+      end
     end
 
     relative_path_dir = Pathname(relative_path).dirname