diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 57055271..acb5ad8a 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -98,6 +98,17 @@ public function register()
             ], Response::HTTP_INTERNAL_SERVER_ERROR);
         });
 
+        if (config('app.debug')) {
+            $this->renderable(function (Throwable $e) {
+                return response()->json([
+                    'type' => get_class($e),
+                    'message' => $e->getMessage(),
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                    'trace' => $e->getTrace(),
+                ], Response::HTTP_INTERNAL_SERVER_ERROR);
+            });
+        }
         $this->renderable(function (Throwable $e) {
             return response()->json([
                 'type' => get_class($e),
diff --git a/app/Http/Controllers/API/Settings/SubscriptionController.php b/app/Http/Controllers/API/Settings/SubscriptionController.php
index 912650cf..52a0bf29 100644
--- a/app/Http/Controllers/API/Settings/SubscriptionController.php
+++ b/app/Http/Controllers/API/Settings/SubscriptionController.php
@@ -96,6 +96,7 @@ public function show(Extension $extension, Server $server)
                 [
                     'endpoint' => 'license',
                     'type' => 'get',
+                    'service' => 'admin'
                 ]
             );
             $parsed = new GolangLicense($output);