diff --git a/commands/pokedex/pokedex-move.js b/commands/pokedex/pokedex-move.js
index 7b8cea23..f7322a9a 100644
--- a/commands/pokedex/pokedex-move.js
+++ b/commands/pokedex/pokedex-move.js
@@ -44,7 +44,7 @@ module.exports = class PokedexMoveCommand extends Command {
 				.addField('❯ Power', data.power, true)
 				.addField('❯ PP', data.pp, true)
 				.addField('❯ Type', data.type, true)
-				.addField('❯ Contest Type', data.contestType, true)
+				.addField('❯ Contest Type', data.contestType || 'N/A', true)
 				.addField('❯ Class', data.class, true);
 			return msg.embed(embed);
 		} catch (err) {
diff --git a/structures/pokemon/Move.js b/structures/pokemon/Move.js
index 3f267e64..4e64133d 100644
--- a/structures/pokemon/Move.js
+++ b/structures/pokemon/Move.js
@@ -14,7 +14,7 @@ module.exports = class Move {
 		this.power = data.power;
 		this.pp = data.pp;
 		this.type = firstUpperCase(data.type.name);
-		this.contestType = firstUpperCase(data.contest_type.name);
+		this.contestType = data.contest_type ? firstUpperCase(data.contest_type.name) : null;
 		this.class = firstUpperCase(data.damage_class.name);
 	}