unfumble

Author: Luca Forstner

packages/nextjs/src/common/pages-router-instrumentation/wrapErrorGetInitialPropsWithSentry.ts

@@ -48,14 +48,16 @@ export function wrapErrorGetInitialPropsWithSentry(
           sentryTrace?: string;
         } = await tracedGetInitialProps.apply(thisArg, args);
 
-        // The Next.js serializer throws on undefined values so we need to guard for it (#12102)
-        if (sentryTrace) {
-          (errorGetInitialProps as Record<string, unknown>)._sentryTraceData = sentryTrace;
-        }
+        if (typeof errorGetInitialProps === 'object' && errorGetInitialProps !== null) {
+          if (sentryTrace) {
+            // The Next.js serializer throws on undefined values so we need to guard for it (#12102)
+            (errorGetInitialProps as Record<string, unknown>)._sentryTraceData = sentryTrace;
+          }
 
-        // The Next.js serializer throws on undefined values so we need to guard for it (#12102)
-        if (baggage) {
-          (errorGetInitialProps as Record<string, unknown>)._sentryBaggage = baggage;
+          // The Next.js serializer throws on undefined values so we need to guard for it (#12102)
+          if (baggage) {
+            (errorGetInitialProps as Record<string, unknown>)._sentryBaggage = baggage;
+          }
         }
 
         return errorGetInitialProps;

packages/nextjs/src/common/pages-router-instrumentation/wrapGetServerSidePropsWithSentry.ts

@@ -34,9 +34,13 @@ export function wrapGetServerSidePropsWithSentry(
         data: serverSideProps,
         baggage,
         sentryTrace,
+      }: {
+        data?: unknown;
+        baggage?: string;
+        sentryTrace?: string;
       } = await (tracedGetServerSideProps.apply(thisArg, args) as ReturnType<typeof tracedGetServerSideProps>);
 
-      if (typeof serverSideProps === 'object' && 'props' in serverSideProps) {
+      if (typeof serverSideProps === 'object' && serverSideProps !== null && 'props' in serverSideProps) {
         // The Next.js serializer throws on undefined values so we need to guard for it (#12102)
         if (sentryTrace) {
           (serverSideProps.props as Record<string, unknown>)._sentryTraceData = sentryTrace;