diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php
index 87a89336d..9b399457a 100644
--- a/airtime_mvc/application/models/RabbitMq.php
+++ b/airtime_mvc/application/models/RabbitMq.php
@@ -141,7 +141,7 @@ class Application_Model_RabbitMq
         $channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange);
         
         $msg = new AMQPMessage($jsonData, array('content_type' => 'text/plain'));
-        
+
         $channel->basic_publish($msg, $exchange);
         $channel->close();
         $conn->close();
diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index b43bac3c0..8360bfa77 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -122,9 +122,8 @@ class Rest_MediaController extends Zend_Rest_Controller
                 ->appendBody("ERROR: Disk Quota reached.");
         }
         catch (Exception $e) {
-            $this->unknownErrorResponse();
-            Logging::error($e->getMessage());
-            throw $e;
+            $this->serviceUnavailableResponse();
+            Logging::error($e->getMessage() . "\n" . $e->getTraceAsString());
         }
     }
 
@@ -209,5 +208,12 @@ class Rest_MediaController extends Zend_Rest_Controller
         $resp->setHttpResponseCode(400);
         $resp->appendBody("An unknown error occurred.");
     }
+
+    private function serviceUnavailableResponse()
+    {
+        $resp = $this->getResponse();
+        $resp->setHttpResponseCode(400);
+        $resp->appendBody("An error occurred while processing your upload. Please try again in a few minutes.");
+    }
 }