diff --git a/app/controllers/pool_versions_controller.rb b/app/controllers/pool_versions_controller.rb
index ca5d44dd4..69966ddb6 100644
--- a/app/controllers/pool_versions_controller.rb
+++ b/app/controllers/pool_versions_controller.rb
@@ -29,17 +29,7 @@ private
 
   def check_availabililty
     if !PoolArchive.enabled?
-      respond_to do |format|
-        format.html do
-          flash[:notice] = "Archive service is not configured. Pool versions are not saved."
-          redirect_to :back
-        end
-        format.json do
-          render json: {success: false, reason: "Archive service is not configured"}.to_json, status: 501
-        end
-      end
-
-      return false
+      raise NotImplementedError.new("Archive service is not configured. Pool versions are not saved.")
     end
   end
 end
diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb
index 53af253d2..a7799af52 100644
--- a/app/controllers/post_versions_controller.rb
+++ b/app/controllers/post_versions_controller.rb
@@ -1,5 +1,6 @@
 class PostVersionsController < ApplicationController
   before_filter :member_only
+  before_filter :check_availabililty
   respond_to :html, :xml, :json
 
   def index
@@ -25,4 +26,12 @@ class PostVersionsController < ApplicationController
       format.js
     end
   end
+
+  private
+
+  def check_availabililty
+    if !PostArchive.enabled?
+      raise NotImplementedError.new("Archive service is not configured. Post versions are not saved.")
+    end
+  end
 end
diff --git a/app/models/pool_archive.rb b/app/models/pool_archive.rb
index e050e097d..4bd8ad3ef 100644
--- a/app/models/pool_archive.rb
+++ b/app/models/pool_archive.rb
@@ -43,7 +43,7 @@ class PoolArchive < ActiveRecord::Base
   def self.queue(pool)
     # queue updates to sqs so that if archives goes down for whatever reason it won't
     # block pool updates
-    raise "Archive service is not configured" if !enabled?
+    raise NotImplementedError.new("Archive service is not configured.") if !enabled?
 
     json = {
       pool_id: pool.id,
diff --git a/app/models/pool_version.rb b/app/models/pool_version.rb
index 753eec2fc..d66eed0ea 100644
--- a/app/models/pool_version.rb
+++ b/app/models/pool_version.rb
@@ -35,7 +35,7 @@ class PoolVersion < ActiveRecord::Base
   extend SearchMethods
 
   def self.export_to_archives(starting_version_id = 0)
-    raise "SQS URL not setup" if Danbooru.config.aws_sqs_archives_url.nil?
+    raise NotImplementedError.new("SQS URL not setup") if Danbooru.config.aws_sqs_archives_url.nil?
 
     credentials = Aws::Credentials.new(
       Danbooru.config.aws_access_key_id,
diff --git a/app/models/post_archive.rb b/app/models/post_archive.rb
index 8b2d3ccb3..5430a2509 100644
--- a/app/models/post_archive.rb
+++ b/app/models/post_archive.rb
@@ -60,7 +60,7 @@ class PostArchive < ActiveRecord::Base
       def queue(post)
         # queue updates to sqs so that if archives goes down for whatever reason it won't
         # block post updates
-        raise "Archive service is not configured" if !enabled?
+        raise NotImplementedError.new("Archive service is not configured") if !enabled?
 
         json = {
           "post_id" => post.id,