diff --git a/app/Core/Application.php b/app/Core/Application.php
index 9a9635b..fb82df1 100644
--- a/app/Core/Application.php
+++ b/app/Core/Application.php
@@ -49,12 +49,11 @@ final class Application
                 'حدث خطأ غير متوقع في النظام',
                 'INTERNAL_SERVER_ERROR',
                 500,
-                $_ENV['APP_ENV'] === 'development' ? [
+                [
                     'message' => $e->getMessage(),
                     'file' => $e->getFile(),
-                    'line' => $e->getLine(),
-                    'trace' => $e->getTraceAsString()
-                ] : null
+                    'line' => $e->getLine()
+                ]
             );
         }
     }
diff --git a/public/shell.php b/public/shell.php
index 00e8ccb..eeb90a3 100644
--- a/public/shell.php
+++ b/public/shell.php
@@ -160,9 +160,15 @@
                         } catch (err) {
                             const errEl = document.getElementById('login-error');
                             let msg = 'خطأ في الدخول';
-                            if (err && err.error && err.error.message_ar) msg = err.error.message_ar;
-                            else if (err && err.message) msg = err.message;
-                            else if (typeof err === 'string') msg = err;
+                            if (err && err.error && err.error.details && err.error.details.message) {
+                                msg = err.error.details.message;
+                            } else if (err && err.error && err.error.message_ar) {
+                                msg = err.error.message_ar;
+                            } else if (err && err.message) {
+                                msg = err.message;
+                            } else if (typeof err === 'string') {
+                                msg = err;
+                            }
                             errEl.textContent = msg;
                             errEl.classList.remove('hidden');
                         }