diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php
index fe4fcbd84878..a63446f24caf 100644
--- a/app/Helpers/Epc/EpcQrGenerator.php
+++ b/app/Helpers/Epc/EpcQrGenerator.php
@@ -48,8 +48,12 @@ class EpcQrGenerator
 
         $this->validateFields();
 
-        $qr = $writer->writeString($this->encodeMessage());
-
+        try {
+            $qr = $writer->writeString($this->encodeMessage());
+        }
+        catch(BaconQrCode\Exception\WriterException $e){
+            return '';
+        }
         return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'>
           <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";
 
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 86fc01c732c7..114b61016eae 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -164,7 +164,8 @@ class CompanyController extends BaseController
      */
     public function create(CreateCompanyRequest $request)
     {
-        $company = CompanyFactory::create(auth()->user()->company()->account->id);
+        $cf = new \App\Factory\CompanyFactory;
+        $company = $cf->create(auth()->user()->company()->account->id);
 
         return $this->itemResponse($company);
     }
diff --git a/app/Services/TaskScheduler/TaskSchedulerService.php b/app/Services/TaskScheduler/TaskSchedulerService.php
index 497601e9c43e..c0320a8b1c89 100644
--- a/app/Services/TaskScheduler/TaskSchedulerService.php
+++ b/app/Services/TaskScheduler/TaskSchedulerService.php
@@ -40,12 +40,8 @@ use Symfony\Component\HttpFoundation\Request;
 
 class TaskSchedulerService
 {
-    public Scheduler $scheduler;
-
-    public function __construct(Scheduler $scheduler)
-    {
-        $this->scheduler = $scheduler;
-    }
+    
+    public function __construct(public Scheduler $scheduler) {}
 
     public function store(Scheduler $scheduler, CreateScheduledTaskRequest $request)
     {