diff --git a/packages/cli/src/sdr.ts b/packages/cli/src/sdr.ts
index 6a0c6c7a6..3ca510b39 100644
--- a/packages/cli/src/sdr.ts
+++ b/packages/cli/src/sdr.ts
@@ -37,12 +37,18 @@ sdr
         type: 'autocomplete',
         pageSize: 15,
         suggestOnly: true,
-        source: async (answers: any, search: string) => {
+        source: async (answers: any, input: string) => {
           const res = fuzzy
-            .filter(search, subjects)
+            .filter(input, subjects)
             .map((el: any) => (typeof el === 'string' ? el : el.original))
           return res
         },
+        validate(val) {
+          if (!val || !val.startsWith('did:')) {
+            return "Subject DID does not start with 'did:'..."
+          }
+          return true;
+        }
       },
       {
         type: 'input',
@@ -221,17 +227,19 @@ sdr
       },
     ])
 
+    const msg_data = {
+      from: answers.iss,
+      to: answers.sub,
+      type: 'jwt',
+      body: jwt,
+    }
+
     if (!send) {
-      await agent.handleMessage({ raw: jwt, metaData: [{ type: 'cli' }], save: true })
+      await agent.handleMessage({ raw: JSON.stringify(msg_data), metaData: [{ type: 'cli' }], save: true })
     } else if (answers.sub !== '') {
       try {
         const result = await agent.sendMessageDIDCommAlpha1({
-          data: {
-            from: answers.iss,
-            to: answers.sub,
-            type: 'jwt',
-            body: jwt,
-          },
+          data: msg_data,
         })
         console.log('Sent:', result)
       } catch (e) {