diff --git a/src/layouts/admin.blade.php b/src/layouts/admin.blade.php
index b900adb..6934750 100644
--- a/src/layouts/admin.blade.php
+++ b/src/layouts/admin.blade.php
@@ -123,7 +123,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                 </h6>
                 <ul class="nav flex-column">
                     <li
-                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.support') ? 'active' : '' }}">
+                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.support') ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
                             aria-expanded="false" title="{{ __('interface.misc.support') }}">
                             <div>
@@ -159,7 +159,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                 </h6>
                 <ul class="nav flex-column">
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.customers') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.customers') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('admin.customers') }}"
                             title="{{ __('interface.misc.customers') }}" data-toggle="tooltip">
                             <i class="bi bi-person"></i>
@@ -167,7 +167,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.customers')
                         </a>
                     </li>
                     <li
-                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.invoices.customers') ? 'active' : '' }}">
+                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.invoices.customers') ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
                             aria-expanded="false" title="{{ __('interface.misc.invoices') }}">
                             <div>
@@ -194,7 +194,7 @@ class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'adm
                         </div>
                     </li>
                     <li
-                        class="nav-item dropdown show {{ (str_contains(Request::route()?->getName(), 'admin.contracts') ? 'active' : '') || (str_contains(Request::route()?->getName(), 'admin.discounts') ? 'active' : '') }}">
+                        class="nav-item dropdown show {{ (str_contains(Request::route()?->getName() ?? '', 'admin.contracts') ? 'active' : '') || (str_contains(Request::route()?->getName() ?? '', 'admin.discounts') ? 'active' : '') }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
                             aria-expanded="false" title="{{ __('interface.misc.contracts') }}">
                             <div>
@@ -218,7 +218,7 @@ class="nav-item dropdown show {{ (str_contains(Request::route()?->getName(), 'ad
                         </div>
                     </li>
                     <li
-                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.shop') ? 'active' : '' }}">
+                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.shop') ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
                             aria-expanded="false" title="{{ __('interface.misc.shop') }}">
                             <div>
@@ -257,7 +257,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                 </h6>
                 <ul class="nav flex-column">
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.suppliers') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.suppliers') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('admin.suppliers') }}"
                             title="{{ __('interface.misc.suppliers') }}" data-toggle="tooltip">
                             <i class="bi bi-person"></i>
@@ -265,7 +265,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.suppliers')
                         </a>
                     </li>
                     <li
-                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.invoices.suppliers') ? 'active' : '' }}">
+                        class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.invoices.suppliers') ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
                             aria-expanded="false" title="{{ __('interface.misc.invoices') }}">
                             <div>
@@ -299,7 +299,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                 <ul class="nav flex-column">
                     @if (Auth::user()->role == 'admin')
                         <li
-                            class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.employees') ? 'active' : '' }}">
+                            class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.employees') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('admin.employees') }}"
                                 title="{{ __('interface.misc.employees') }}" data-toggle="tooltip">
                                 <i class="bi bi-person"></i>
@@ -308,7 +308,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.employees')
                         </li>
                     @endif
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.pages') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.pages') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('admin.pages') }}"
                             title="{{ __('interface.misc.custom_pages') }}" data-toggle="tooltip">
                             <i class="bi bi-list"></i>
@@ -316,7 +316,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.pages') ? '
                         </a>
                     </li>
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.filemanager') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.filemanager') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('admin.filemanager') }}"
                             title="{{ __('interface.misc.file_manager') }}" data-toggle="tooltip">
                             <i class="bi bi-folder"></i>
@@ -332,7 +332,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                     <ul class="nav flex-column">
                         @if (Auth::user()->role == 'admin')
                             <li
-                                class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.settings') ? 'active' : '' }}">
+                                class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.settings') ? 'active' : '' }}">
                                 <a class="nav-link" href="{{ route('admin.settings') }}"
                                     title="{{ __('interface.misc.parameters') }}" data-toggle="tooltip">
                                     <i class="bi bi-gear-wide-connected"></i>
@@ -340,7 +340,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.settings')
                                 </a>
                             </li>
                             <li
-                                class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.paymentgateways') ? 'active' : '' }}">
+                                class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.paymentgateways') ? 'active' : '' }}">
                                 <a class="nav-link" href="{{ route('admin.paymentgateways') }}"
                                     title="{{ __('interface.misc.payment_gateways') }}" data-toggle="tooltip">
                                     <i class="bi bi-currency-euro"></i>
@@ -348,7 +348,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.paymentgate
                                 </a>
                             </li>
                             <li
-                                class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.api.users') ? 'active' : '' }}">
+                                class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.api.users') ? 'active' : '' }}">
                                 <a class="nav-link dropdown-toggle" href="#" id="dropdown04"
                                     data-toggle="dropdown" aria-expanded="false"
                                     title="{{ __('interface.misc.api') }}">
@@ -369,7 +369,7 @@ class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'adm
                             </li>
                             @if (empty(request()->get('tenant')))
                                 <li
-                                    class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.tenants') ? 'active' : '' }}">
+                                    class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.tenants') ? 'active' : '' }}">
                                     <a class="nav-link" href="{{ route('admin.tenants') }}"
                                         title="{{ __('interface.misc.tenants') }}" data-toggle="tooltip">
                                         <i class="bi bi-people"></i>
diff --git a/src/layouts/customer.blade.php b/src/layouts/customer.blade.php
index d25b7ae..808e3ef 100644
--- a/src/layouts/customer.blade.php
+++ b/src/layouts/customer.blade.php
@@ -101,7 +101,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
                             <span>{{ __('interface.misc.dashboard') }}</span>
                         </a>
                     </li>
-                    <li class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support') ? 'active' : '' }}"
+                    <li class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.support') ? 'active' : '' }}"
                         data-toggle="tooltip">
                         <a class="nav-link" href="{{ route('customer.support') }}"
                             title="{{ __('interface.misc.tickets') }}">
@@ -114,7 +114,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
                         </a>
                     </li>
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contracts') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.contracts') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('customer.contracts') }}"
                             title="{{ __('interface.misc.contracts') }}" data-toggle="tooltip">
                             <i class="bi bi-file-earmark-text-fill"></i>
@@ -122,7 +122,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contract
                         </a>
                     </li>
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.invoices') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('customer.invoices') }}"
                             title="{{ __('interface.misc.invoices') }}" data-toggle="tooltip">
                             <i class="bi bi-file-earmark-text">
@@ -136,7 +136,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices
                         </a>
                     </li>
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.orders') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.orders') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('customer.shop.orders') }}"
                             title="{{ __('interface.misc.orders') }}" data-toggle="tooltip">
                             <i class="bi bi-cart-fill"></i>
@@ -168,7 +168,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
                 </h6>
                 <ul class="nav flex-column">
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'public.shop') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'public.shop') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('public.shop') }}"
                             title="{{ __('interface.actions.browse') }}" data-toggle="tooltip">
                             <i class="bi bi-arrow-right"></i>
diff --git a/src/layouts/public.blade.php b/src/layouts/public.blade.php
index 0761886..c9e136d 100644
--- a/src/layouts/public.blade.php
+++ b/src/layouts/public.blade.php
@@ -111,7 +111,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
                             </a>
                         </li>
                         <li
-                            class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support') ? 'active' : '' }}">
+                            class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.support') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('customer.support') }}"
                                 title="{{ __('interface.misc.tickets') }}" data-toggle="tooltip">
                                 <i class="bi bi-ticket-fill">
@@ -123,7 +123,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support'
                             </a>
                         </li>
                         <li
-                            class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contracts') ? 'active' : '' }}">
+                            class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.contracts') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('customer.contracts') }}"
                                 title="{{ __('interface.misc.contracts') }}" data-toggle="tooltip">
                                 <i class="bi bi-file-earmark-text-fill"></i>
@@ -131,7 +131,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contract
                             </a>
                         </li>
                         <li
-                            class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices') ? 'active' : '' }}">
+                            class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.invoices') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('customer.invoices') }}"
                                 title="{{ __('interface.misc.invoices') }}" data-toggle="tooltip">
                                 <i class="bi bi-file-earmark-text">
@@ -145,7 +145,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices
                             </a>
                         </li>
                         <li
-                            class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.orders') ? 'active' : '' }}">
+                            class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.orders') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('customer.shop.orders') }}"
                                 title="{{ __('interface.misc.orders') }}" data-toggle="tooltip">
                                 <i class="bi bi-cart-fill"></i>
@@ -178,7 +178,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
                 </h6>
                 <ul class="nav flex-column">
                     <li
-                        class="nav-item {{ str_contains(Request::route()?->getName(), 'public.shop') ? 'active' : '' }}">
+                        class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'public.shop') ? 'active' : '' }}">
                         <a class="nav-link" href="{{ route('public.shop') }}"
                             title="{{ __('interface.actions.browse') }}" data-toggle="tooltip">
                             <i class="bi bi-arrow-right"></i>