diff --git a/src/conversation-store.ts b/src/conversation-store.ts
index 6212df663..6d17c68f0 100644
--- a/src/conversation-store.ts
+++ b/src/conversation-store.ts
@@ -36,8 +36,10 @@ export class MemoryStore<ConversationState = any> implements ConversationStore<C
           // release the memory
           this.state.delete(conversationId);
           reject(new Error('Conversation expired'));
+          return;
         }
         resolve(entry.value);
+        return;
       }
       reject(new Error('Conversation not found'));
     });
diff --git a/src/errors.ts b/src/errors.ts
index 582aea969..ef250b44c 100644
--- a/src/errors.ts
+++ b/src/errors.ts
@@ -106,7 +106,7 @@ export class ContextMissingPropertyError extends Error implements CodedError {
 }
 
 export class InvalidCustomPropertyError extends Error implements CodedError {
-  public code = ErrorCode.AppInitializationError;
+  public code = ErrorCode.InvalidCustomPropertyError;
 }
 
 export class CustomRouteInitializationError extends Error implements CodedError {