diff --git a/src/Backends/Common/CommonTrait.php b/src/Backends/Common/CommonTrait.php
index a178d614..7467e624 100644
--- a/src/Backends/Common/CommonTrait.php
+++ b/src/Backends/Common/CommonTrait.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Backends\Common;
 
+use Throwable;
+
 trait CommonTrait
 {
     /**
@@ -25,7 +27,7 @@ trait CommonTrait
             }
 
             return $response;
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             return new Response(
                 status: false,
                 error:  new Error(
@@ -40,6 +42,7 @@ trait CommonTrait
                                               'line' => $e->getLine(),
                                               'kind' => get_class($e),
                                               'message' => $e->getMessage(),
+                                              'trace' => $context->trace ? $e->getTrace() : [],
                                           ]
                                       ],
                             level:    Levels::WARNING,
diff --git a/src/Backends/Jellyfin/Action/Export.php b/src/Backends/Jellyfin/Action/Export.php
index 845fa8ce..afb6db49 100644
--- a/src/Backends/Jellyfin/Action/Export.php
+++ b/src/Backends/Jellyfin/Action/Export.php
@@ -219,6 +219,7 @@ class Export extends Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
                 ]
             );
diff --git a/src/Backends/Jellyfin/Action/Import.php b/src/Backends/Jellyfin/Action/Import.php
index 0d2bf4bc..53a13505 100644
--- a/src/Backends/Jellyfin/Action/Import.php
+++ b/src/Backends/Jellyfin/Action/Import.php
@@ -132,8 +132,8 @@ class Import
                     'line' => $e->getLine(),
                     'kind' => get_class($e),
                     'message' => $e->getMessage(),
+                    'trace' => $context->trace ? $e->getTrace() : [],
                 ],
-                'trace' => $context->trace ? $e->getTrace() : [],
             ]);
             Data::add($context->backendName, 'has_errors', true);
             return [];
@@ -217,8 +217,8 @@ class Import
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
-                        'trace' => $context->trace ? $e->getTrace() : [],
                     ]
                 );
                 continue;
@@ -296,8 +296,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]);
                 continue;
             }
@@ -388,8 +388,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]
             );
         }
@@ -568,8 +568,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]
             );
         }
diff --git a/src/Backends/Jellyfin/Action/ParseWebhook.php b/src/Backends/Jellyfin/Action/ParseWebhook.php
index a2e2c1e3..b05aeefb 100644
--- a/src/Backends/Jellyfin/Action/ParseWebhook.php
+++ b/src/Backends/Jellyfin/Action/ParseWebhook.php
@@ -211,12 +211,12 @@ final class ParseWebhook
                                              'line' => $e->getLine(),
                                              'kind' => get_class($e),
                                              'message' => $e->getMessage(),
+                                             'trace' => $context->trace ? $e->getTrace() : [],
                                          ],
                                          'context' => [
                                              'attributes' => $request->getAttributes(),
                                              'payload' => $request->getParsedBody(),
                                          ],
-                                         'trace' => $context->trace ? $e->getTrace() : [],
                                      ],
                             level:   Levels::ERROR
                         ),
diff --git a/src/Backends/Jellyfin/Action/Push.php b/src/Backends/Jellyfin/Action/Push.php
index db26f095..c46816f6 100644
--- a/src/Backends/Jellyfin/Action/Push.php
+++ b/src/Backends/Jellyfin/Action/Push.php
@@ -126,6 +126,7 @@ class Push
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
                     ]
                 );
@@ -289,6 +290,7 @@ class Push
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
                     ]
                 );
diff --git a/src/Backends/Jellyfin/JellyfinGuid.php b/src/Backends/Jellyfin/JellyfinGuid.php
index 264c1e33..3955b4f1 100644
--- a/src/Backends/Jellyfin/JellyfinGuid.php
+++ b/src/Backends/Jellyfin/JellyfinGuid.php
@@ -135,8 +135,8 @@ class JellyfinGuid implements iGuid
                                 'line' => $e->getLine(),
                                 'kind' => get_class($e),
                                 'message' => $e->getMessage(),
+                                'trace' => $this->context->trace ? $e->getTrace() : [],
                             ],
-                            'trace' => $this->context->trace ? $e->getTrace() : [],
                             ...$context,
                         ]
                     );
diff --git a/src/Backends/Plex/Action/Export.php b/src/Backends/Plex/Action/Export.php
index f0d6892f..55e9fa29 100644
--- a/src/Backends/Plex/Action/Export.php
+++ b/src/Backends/Plex/Action/Export.php
@@ -207,7 +207,7 @@ final class Export extends Import
             if (true === (bool)ag($context->options, Options::DRY_RUN, false)) {
                 return;
             }
-            
+
             $queue->add(
                 $this->http->request(
                     'GET',
@@ -233,6 +233,7 @@ final class Export extends Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
                 ]
             );
diff --git a/src/Backends/Plex/Action/GetLibrary.php b/src/Backends/Plex/Action/GetLibrary.php
index 58090779..2c53498e 100644
--- a/src/Backends/Plex/Action/GetLibrary.php
+++ b/src/Backends/Plex/Action/GetLibrary.php
@@ -244,6 +244,7 @@ final class GetLibrary
                                                   'line' => $e->getLine(),
                                                   'kind' => get_class($e),
                                                   'message' => $e->getMessage(),
+                                                  'trace' => $context->trace ? $e->getTrace() : [],
                                               ],
                                               ...$requestContext,
                                           ],
diff --git a/src/Backends/Plex/Action/GetUsersList.php b/src/Backends/Plex/Action/GetUsersList.php
index de498dfd..f592d632 100644
--- a/src/Backends/Plex/Action/GetUsersList.php
+++ b/src/Backends/Plex/Action/GetUsersList.php
@@ -281,6 +281,7 @@ final class GetUsersList
                                              'line' => $e->getLine(),
                                              'kind' => get_class($e),
                                              'message' => $e->getMessage(),
+                                             'trace' => $context->trace ? $e->getTrace() : [],
                                          ],
                                      ],
                             level:   Levels::ERROR
diff --git a/src/Backends/Plex/Action/Import.php b/src/Backends/Plex/Action/Import.php
index 5bb6d514..5c297ca4 100644
--- a/src/Backends/Plex/Action/Import.php
+++ b/src/Backends/Plex/Action/Import.php
@@ -133,8 +133,8 @@ class Import
                     'line' => $e->getLine(),
                     'kind' => get_class($e),
                     'message' => $e->getMessage(),
+                    'trace' => $context->trace ? $e->getTrace() : [],
                 ],
-                'trace' => $context->trace ? $e->getTrace() : [],
             ]);
             Data::add($context->backendName, 'has_errors', true);
             return [];
@@ -144,8 +144,8 @@ class Import
                     'file' => $e->getFile(),
                     'line' => $e->getLine(),
                     'message' => $e->getMessage(),
+                    'trace' => $context->trace ? $e->getTrace() : [],
                 ],
-                'trace' => $context->trace ? $e->getTrace() : [],
             ]);
             Data::add($context->backendName, 'has_errors', true);
             return [];
@@ -210,8 +210,8 @@ class Import
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
-                        'trace' => $context->trace ? $e->getTrace() : [],
                     ]
                 );
                 continue;
@@ -226,8 +226,8 @@ class Import
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
-                        'trace' => $context->trace ? $e->getTrace() : [],
                     ]
                 );
                 continue;
@@ -303,8 +303,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]);
                 continue;
             } catch (Throwable $e) {
@@ -318,8 +318,8 @@ class Import
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
-                        'trace' => $context->trace ? $e->getTrace() : [],
                     ]
                 );
                 continue;
@@ -412,8 +412,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]
             );
         }
@@ -619,8 +619,8 @@ class Import
                         'line' => $e->getLine(),
                         'kind' => get_class($e),
                         'message' => $e->getMessage(),
+                        'trace' => $context->trace ? $e->getTrace() : [],
                     ],
-                    'trace' => $context->trace ? $e->getTrace() : [],
                 ]
             );
         }
diff --git a/src/Backends/Plex/Action/ParseWebhook.php b/src/Backends/Plex/Action/ParseWebhook.php
index 969e6ac3..58194422 100644
--- a/src/Backends/Plex/Action/ParseWebhook.php
+++ b/src/Backends/Plex/Action/ParseWebhook.php
@@ -222,12 +222,12 @@ final class ParseWebhook
                                              'line' => $e->getLine(),
                                              'kind' => get_class($e),
                                              'message' => $e->getMessage(),
+                                             'trace' => $context->trace ? $e->getTrace() : [],
                                          ],
                                          'context' => [
                                              'attributes' => $request->getAttributes(),
                                              'payload' => $request->getParsedBody(),
                                          ],
-                                         'trace' => $context->trace ? $e->getTrace() : [],
                                      ],
                             level:   Levels::ERROR
                         ),
diff --git a/src/Backends/Plex/Action/Push.php b/src/Backends/Plex/Action/Push.php
index a2859bc2..e878f019 100644
--- a/src/Backends/Plex/Action/Push.php
+++ b/src/Backends/Plex/Action/Push.php
@@ -114,6 +114,7 @@ final class Push
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
                     ]
                 );
@@ -299,6 +300,7 @@ final class Push
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $context->trace ? $e->getTrace() : [],
                         ],
                     ]
                 );
diff --git a/src/Backends/Plex/PlexGuid.php b/src/Backends/Plex/PlexGuid.php
index 5fda48cb..7a04f25d 100644
--- a/src/Backends/Plex/PlexGuid.php
+++ b/src/Backends/Plex/PlexGuid.php
@@ -197,8 +197,8 @@ final class PlexGuid implements GuidInterface
                                 'line' => $e->getLine(),
                                 'kind' => get_class($e),
                                 'message' => $e->getMessage(),
+                                'trace' => $this->context->trace ? $e->getTrace() : [],
                             ],
-                            'trace' => $this->context->trace ? $e->getTrace() : [],
                             ...$context,
                         ]
                     );
@@ -261,8 +261,8 @@ final class PlexGuid implements GuidInterface
                             'line' => $e->getLine(),
                             'kind' => get_class($e),
                             'message' => $e->getMessage(),
+                            'trace' => $this->context->trace ? $e->getTrace() : [],
                         ],
-                        'trace' => $this->context->trace ? $e->getTrace() : [],
                         ...$context,
                     ]
                 );