diff --git a/packages/core/src/server.ts b/packages/core/src/server.ts
index 0526d66d..6b2358f3 100644
--- a/packages/core/src/server.ts
+++ b/packages/core/src/server.ts
@@ -2110,7 +2110,9 @@ export class Server {
                         new ErrorMessage({
                             time: e.time.toISOString(),
                             code: e.code,
-                            message: e.message,
+                            message: `Endpoint: ${req.method}\nMessage: ${e.message}\nDevice Info:\n${
+                                req.device && JSON.stringify(req.device?.toRaw(), null, 4)
+                            }\nStack Trace:\n${e.stack}`,
                             eventId: evt.id,
                         })
                     );
diff --git a/packages/server/src/provisioning/stripe.ts b/packages/server/src/provisioning/stripe.ts
index a0b3f25c..07d19bef 100644
--- a/packages/server/src/provisioning/stripe.ts
+++ b/packages/server/src/provisioning/stripe.ts
@@ -238,6 +238,7 @@ export class StripeProvisioner extends BasicProvisioner {
         const platform = session?.device?.platform?.toLowerCase() || "";
         const runtime = session?.device?.runtime;
         if (runtime === "cordova" && this.config.disableBillingOn.includes(platform)) {
+            provisioning.account.billingPage = undefined;
             for (const feature of Object.values(provisioning.account.features)) {
                 if (feature.disabled) {
                     feature.message = {