diff --git a/include/class.upgrader.php b/include/class.upgrader.php
index 927f4660db8c9a0a7124f19d68408f4a956df144..d04b8f2840f61c66f8a03d671700c79e3c715b82 100644
--- a/include/class.upgrader.php
+++ b/include/class.upgrader.php
@@ -314,7 +314,7 @@ class StreamUpgrader extends SetupWizard {
     function getPendingTask() {
 
         $pending=array();
-        if ($task=$this->getTask())
+        if (($task=$this->getTask()) && $task)
             return ($task->isFinished()) ? 1 : 0;
 
         return false;
diff --git a/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php b/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
index 70b8c7f14840a74d50f9f703257ba31c60ad3aae..aae021914ed121db612f4d2f2964d4b40e2f2641 100644
--- a/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
+++ b/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
@@ -18,4 +18,7 @@ class CompanyFormLoader extends MigrationTask {
         }
     }
 }
+
+return 'CompanyFormLoader';
+
 ?>