diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index 073cf03be88f..7596948867b8 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -50,7 +50,6 @@ class SetDomainNameDb
             ];
 
             if ($company = MultiDB::findAndSetDbByDomain($query)) {
-                //$request->merge(['company_key' => $company->company_key]);
                 session()->put('company_key', $company->company_key);
             } else {
                 if ($request->json) {
@@ -68,7 +67,6 @@ class SetDomainNameDb
             ];
 
             if ($company = MultiDB::findAndSetDbByDomain($query)) {
-                //$request->merge(['company_key' => $company->company_key]);
                 session()->put('company_key', $company->company_key);
             } else {
                 if ($request->json) {
diff --git a/app/Models/Backup.php b/app/Models/Backup.php
index 65352994c90d..2ddc96a685ae 100644
--- a/app/Models/Backup.php
+++ b/app/Models/Backup.php
@@ -51,6 +51,9 @@ class Backup extends BaseModel
     {
         nlog('deleting => '.$this->filename);
 
+        if(!$this->filename)
+            return;
+
         try {
             Storage::disk(config('filesystems.default'))->delete($this->filename);
         } catch (\Exception $e) {