diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 81b3a1798..d08b7bb0f 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -46,7 +46,11 @@
   Danbooru.Upload.initialize_info_bookmarklet = function() {
     $("#source-info ul").hide();
     $("#fetch-data-bookmarklet").click(function(e) {
-      $.get(e.target.href).success(Danbooru.Upload.fill_source_info);
+      var xhr = $.get(e.target.href);
+      xhr.success(Danbooru.Upload.fill_source_info);
+      xhr.fail(function(data) {
+        $("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
+      });
       e.preventDefault();
     });
     $("#fetch-data-bookmarklet").trigger("click");
@@ -63,7 +67,11 @@
         Danbooru.error("Error: Source is not a URL");
       } else {
         $("#source-info span#loading-data").show();
-        $.get("/source.json?url=" + encodeURIComponent(source)).success(Danbooru.Upload.fill_source_info);
+        var xhr = $.get("/source.json?url=" + encodeURIComponent(source));
+        xhr.success(Danbooru.Upload.fill_source_info);
+        xhr.fail(function(data) {
+          $("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
+        });
       }
       e.preventDefault();
     });
diff --git a/app/controllers/sources_controller.rb b/app/controllers/sources_controller.rb
index b098ac5f7..7df7cd2e3 100644
--- a/app/controllers/sources_controller.rb
+++ b/app/controllers/sources_controller.rb
@@ -12,4 +12,14 @@ class SourcesController < ApplicationController
       end
     end
   end
+
+private
+
+  def rescue_exception(exception)
+    respond_with do |format|
+      format.json do
+        render :json => {:message => exception.to_s}, :status => :error
+      end
+    end
+  end
 end