diff --git a/packages/cli/src/CredentialTypes.ts b/packages/cli/src/CredentialTypes.ts
index 7f48050038..8234d0bc55 100644
--- a/packages/cli/src/CredentialTypes.ts
+++ b/packages/cli/src/CredentialTypes.ts
@@ -16,7 +16,11 @@ class CredentialTypesClass implements ICredentialTypesInterface {
 	}
 
 	getByName(credentialType: string): ICredentialType {
-		return this.credentialTypes[credentialType].type;
+		try {
+			return this.credentialTypes[credentialType].type;
+		} catch (error) {
+			throw new Error(`Failed to find credential type: ${credentialType}`);
+		}
 	}
 }