upgrade: fix oops in company info loader task

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;

include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php

@@ -18,4 +18,7 @@ class CompanyFormLoader extends MigrationTask {
         }
     }
 }
+
+return 'CompanyFormLoader';
+
 ?>