diff --git a/airtime_mvc/application/services/PodcastEpisodeService.php b/airtime_mvc/application/services/PodcastEpisodeService.php
index a973a788c..60e9b3879 100644
--- a/airtime_mvc/application/services/PodcastEpisodeService.php
+++ b/airtime_mvc/application/services/PodcastEpisodeService.php
@@ -251,7 +251,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
     public static function getStuckPendingImports() {
         $timeout = gmdate(DEFAULT_TIMESTAMP_FORMAT, (microtime(true) - self::PENDING_EPISODE_TIMEOUT_SECONDS));
         $episodes = PodcastEpisodesQuery::create()
-            ->filterByDbFileId()
+            ->filterByDbFileId(null, Criteria::ISNULL)
             ->find();
         $stuckImports = array();
         foreach ($episodes as $episode) {
diff --git a/airtime_mvc/application/services/ThirdPartyService.php b/airtime_mvc/application/services/ThirdPartyService.php
index 61a979ea6..1fca386f5 100644
--- a/airtime_mvc/application/services/ThirdPartyService.php
+++ b/airtime_mvc/application/services/ThirdPartyService.php
@@ -30,10 +30,12 @@ abstract class Application_Service_ThirdPartyService {
     public function createTrackReference($fileId) {
         // First, check if the track already has an entry in the database
         // If the file ID given is null, create a new reference
-        $ref = is_null($fileId) ? new ThirdPartyTrackReferences()
-                                : ThirdPartyTrackReferencesQuery::create()
-                                    ->filterByDbService(static::$_SERVICE_NAME)
-                                    ->findOneByDbFileId($fileId);
+        $ref = is_null($fileId) ? null : ThirdPartyTrackReferencesQuery::create()
+            ->filterByDbService(static::$_SERVICE_NAME)
+            ->findOneByDbFileId($fileId);
+        if (is_null($ref)) {
+            $ref = new ThirdPartyTrackReferences();
+        }
         $ref->setDbService(static::$_SERVICE_NAME);
         $ref->setDbFileId($fileId);
         $ref->save();