diff --git a/airtime_mvc/application/common/TaskManager.php b/airtime_mvc/application/common/TaskManager.php
index c1687defa..0275d08f3 100644
--- a/airtime_mvc/application/common/TaskManager.php
+++ b/airtime_mvc/application/common/TaskManager.php
@@ -237,14 +237,14 @@ class CeleryTask implements AirtimeTask {
      * @return bool true if there are pending tasks in ThirdPartyTrackReferences
      */
     public function shouldBeRun() {
-        return !CeleryService::isBrokerTaskQueueEmpty();
+        return !CeleryManager::isBrokerTaskQueueEmpty();
     }
 
     /**
      * Poll the task queue for any completed Celery tasks
      */
     public function run() {
-        CeleryService::pollBrokerTaskQueue();
+        CeleryManager::pollBrokerTaskQueue();
     }
 
 }
\ No newline at end of file
diff --git a/airtime_mvc/application/services/CeleryService.php b/airtime_mvc/application/services/CeleryManager.php
similarity index 99%
rename from airtime_mvc/application/services/CeleryService.php
rename to airtime_mvc/application/services/CeleryManager.php
index b05692410..07ab7fa42 100644
--- a/airtime_mvc/application/services/CeleryService.php
+++ b/airtime_mvc/application/services/CeleryManager.php
@@ -2,7 +2,7 @@
 
 require_once "CeleryServiceFactory.php";
 
-class CeleryService {
+class CeleryManager {
 
     /**
      * @var int milliseconds (for compatibility with celery) until we consider a message to have timed out
diff --git a/airtime_mvc/application/services/ThirdPartyCeleryService.php b/airtime_mvc/application/services/ThirdPartyCeleryService.php
index 2a7b12606..24e9a5800 100644
--- a/airtime_mvc/application/services/ThirdPartyCeleryService.php
+++ b/airtime_mvc/application/services/ThirdPartyCeleryService.php
@@ -24,6 +24,30 @@ abstract class ThirdPartyCeleryService extends ThirdPartyService {
      */
     protected static $_CELERY_DELETE_TASK_NAME;
 
+    /**
+     * Execute a Celery task with the given name and data parameters
+     *
+     * FIXME: Currently, downloads will not create task reference rows because they
+     * don't have a valid file identifier - this means that we will never know if there
+     * is an issue with the download before the callback to /rest/media is called!
+     *
+     * @param string $taskName the name of the celery task to execute
+     * @param array $data      the data array to send as task parameters
+     * @param int $fileId      the unique identifier for the file involved in the task
+     */
+    protected function _executeTask($taskName, $data, $fileId) {
+        try {
+            $brokerTaskId = CeleryManager::sendCeleryMessage($taskName,
+                                                             static::$_CELERY_EXCHANGE_NAME,
+                                                             $data);
+            if (!empty($fileId)) {
+                $this->_createTaskReference($fileId, $brokerTaskId, $taskName);
+            }
+        } catch (Exception $e) {
+            Logging::info("Invalid request: " . $e->getMessage());
+        }
+    }
+
     /**
      * Upload the file with the given identifier to a third-party service
      *
@@ -36,20 +60,13 @@ abstract class ThirdPartyCeleryService extends ThirdPartyService {
             'token' => $this->_accessToken,
             'file_path' => $file->getFilePaths()[0]
         );
-        try {
-            $brokerTaskId = CeleryService::sendCeleryMessage(static::$_CELERY_UPLOAD_TASK_NAME,
-                                                             static::$_CELERY_EXCHANGE_NAME,
-                                                             $data);
-            $this->_createTaskReference($fileId, $brokerTaskId, static::$_CELERY_UPLOAD_TASK_NAME);
-        } catch (Exception $e) {
-            Logging::info("Invalid request: " . $e->getMessage());
-        }
+        $this->_executeTask(static::$_CELERY_UPLOAD_TASK_NAME, $data, $fileId);
     }
 
     /**
      * Given a track identifier, download a track from a third-party service.
      *
-     * @param int|null $trackId a track identifier
+     * @param int $trackId a track identifier
      */
     public function download($trackId) {
         $namespace = new Zend_Session_Namespace('csrf_namespace');
@@ -59,13 +76,9 @@ abstract class ThirdPartyCeleryService extends ThirdPartyService {
             'token' => $this->_accessToken,
             'track_id' => $trackId
         );
-        try {
-            CeleryService::sendCeleryMessage(static::$_CELERY_DOWNLOAD_TASK_NAME,
-                                             static::$_CELERY_EXCHANGE_NAME,
-                                             $data);
-        } catch (Exception $e) {
-            Logging::info("Invalid request: " . $e->getMessage());
-        }
+        // FIXME
+        Logging::warn("FIXME: we can't create a task reference without a valid file ID");
+        $this->_executeTask(static::$_CELERY_DOWNLOAD_TASK_NAME, $data, null);
     }
 
     /**
@@ -85,14 +98,7 @@ abstract class ThirdPartyCeleryService extends ThirdPartyService {
             'token' => $this->_accessToken,
             'track_id' => $serviceId
         );
-        try {
-            $brokerTaskId = CeleryService::sendCeleryMessage(static::$_CELERY_DELETE_TASK_NAME,
-                                                             static::$_CELERY_EXCHANGE_NAME,
-                                                             $data);
-            $this->_createTaskReference($fileId, $brokerTaskId, static::$_CELERY_DELETE_TASK_NAME);
-        } catch (Exception $e) {
-            Logging::info("Invalid request: " . $e->getMessage());
-        }
+        $this->_executeTask(static::$_CELERY_DELETE_TASK_NAME, $data, $fileId);
     }
 
     /**
@@ -108,19 +114,19 @@ abstract class ThirdPartyCeleryService extends ThirdPartyService {
      * @throws PropelException
      */
     protected function _createTaskReference($fileId, $brokerTaskId, $taskName) {
-        $trackId = $this->createTrackReference($fileId);
+        $trackReferenceId = $this->createTrackReference($fileId);
         $task = new CeleryTasks();
         $task->setDbTaskId($brokerTaskId);
         $task->setDbName($taskName);
         $utc = new DateTimeZone("UTC");
         $task->setDbDispatchTime(new DateTime("now", $utc));
         $task->setDbStatus(CELERY_PENDING_STATUS);
-        $task->setDbTrackReference($trackId);
+        $task->setDbTrackReference($trackReferenceId);
         $task->save();
     }
 
     /**
-     * Update a CeleryTasks object for a completed upload
+     * Update a CeleryTasks object for a completed task
      * TODO: should we have a database layer class to handle Propel operations?
      *
      * @param $trackId int    ThirdPartyTrackReferences identifier
diff --git a/airtime_mvc/application/services/ThirdPartyService.php b/airtime_mvc/application/services/ThirdPartyService.php
index d3293f18c..523e0e5cc 100644
--- a/airtime_mvc/application/services/ThirdPartyService.php
+++ b/airtime_mvc/application/services/ThirdPartyService.php
@@ -54,7 +54,7 @@ abstract class ThirdPartyService {
     }
 
     /**
-     * Remove a ThirdPartyTrackReferences from the database.
+     * Remove a ThirdPartyTrackReferences row from the database.
      * This is necessary if the track was removed from the service
      * or the foreign id in our database is incorrect
      *