diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
index 8e99d1451..fcdc9aae5 100644
--- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
+++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
@@ -1043,7 +1043,7 @@ class FilterController extends Controller
         $tz = explode(')', substr($location, stripos($location, 'T')
                             + 1));
 
-        return $tz[0];
+        return ($tz[0] != "") ? $tz[0] : "+00:00";
     }
 
     /**
diff --git a/app/Http/Controllers/Agent/helpdesk/MailController.php b/app/Http/Controllers/Agent/helpdesk/MailController.php
index 988260805..4200e6392 100644
--- a/app/Http/Controllers/Agent/helpdesk/MailController.php
+++ b/app/Http/Controllers/Agent/helpdesk/MailController.php
@@ -200,7 +200,7 @@ class MailController extends Controller
             $address = $message->getAddresses('from');
         }
         $collaborators = $this->collaburators($message, $email);
-        $attachments = $message->getAttachments();
+        $attachments = (!$message->getAttachments()) ? []: $message->getAttachments();
         //dd(['body' => $body, 'subject' => $subject, 'address' => $address, 'cc' => $collaborator, 'attachments' => $attachments]);
         $this->workflow($address, $subject, $body, $collaborators, $attachments, $email);
     }
diff --git a/app/Http/Controllers/Common/CommonMailer.php b/app/Http/Controllers/Common/CommonMailer.php
index 4daf61ddf..a5b220556 100644
--- a/app/Http/Controllers/Common/CommonMailer.php
+++ b/app/Http/Controllers/Common/CommonMailer.php
@@ -26,7 +26,7 @@ class CommonMailer
 
             return true;
         } catch (Exception $e) {
-            loging($e->getMessage());
+            loging('mail-config', $e->getMessage());
 
             return $e->getMessage();
         }
diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php
index 6e3781370..adea64cf9 100644
--- a/app/Http/Controllers/Common/PhpMailController.php
+++ b/app/Http/Controllers/Common/PhpMailController.php
@@ -78,7 +78,7 @@ class PhpMailController extends Controller
         $this->dispatch($job);
     }
 
-    public function sendEmail($from, $to, $message, $template_variables)
+    public function sendEmail($from, $to, $message, $template_variables = [])
     {
         $from_address = $this->fetch_smtp_details($from);
         if ($from_address == null) {
diff --git a/config/mail.php b/config/mail.php
index 08dac8de6..c6ab81402 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -15,7 +15,7 @@ return [
       |
      */
 
-    'driver' => env('MAIL', 'smtp'),
+    'driver' =>env('MAIL_DRIVER', 'smtp'),
     /*
       |--------------------------------------------------------------------------
       | SMTP Host Address
diff --git a/example.env b/example.env
deleted file mode 100644
index d6b88a59d..000000000
--- a/example.env
+++ /dev/null
@@ -1,18 +0,0 @@
-APP_ENV=production
-APP_DEBUG=false
-APP_KEY=SomeRandomString
-DB_TYPE=
-DB_HOST=
-DB_PORT=
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-DB_INSTALL=%0%
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
\ No newline at end of file