diff --git a/packages/selective-disclosure/src/message-handler.ts b/packages/selective-disclosure/src/message-handler.ts
index c50e2f1de..eba678db4 100644
--- a/packages/selective-disclosure/src/message-handler.ts
+++ b/packages/selective-disclosure/src/message-handler.ts
@@ -26,8 +26,8 @@ export class SdrMessageHandler extends AbstractMessageHandler {
     const meta = message.getLastMetaData()
 
     if (
-      message.data.type == MessageTypes.sdr &&
-      message.data.claims
+      message?.data?.type == MessageTypes.sdr &&
+      message?.data?.claims
     ) {
       debug('Message type is', MessageTypes.sdr)