diff --git a/app/controllers/concerns/downloadable_controller.rb b/app/controllers/concerns/downloadable_controller.rb
index 4ab7cfae8ef2728001f78bb147057f308f9c92c8..accb20d6c74121758ca26f3dd5ea33b340995cca 100644
--- a/app/controllers/concerns/downloadable_controller.rb
+++ b/app/controllers/concerns/downloadable_controller.rb
@@ -4,7 +4,12 @@ module DownloadableController
   # GET /learning_objects/1/download
   def download
     downloadable.download(current_user, request.remote_ip)
-    redirect_to downloadable.download_link
+    link = downloadable.download_link
+    if !link.blank?
+      redirect_to link
+    else
+      render status: :internal_server_error
+    end
   end
 
   protected