From d008a2559a7aebeb175d3dc1cda059c0e71649e1 Mon Sep 17 00:00:00 2001
From: aikaterna <20862007+aikaterna@users.noreply.github.com>
Date: Wed, 14 Nov 2018 13:56:08 -0800
Subject: [PATCH] [General] Clearer error message for [p]rps (#2284)

---
 redbot/cogs/general/general.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/redbot/cogs/general/general.py b/redbot/cogs/general/general.py
index 605cb75d7..496210582 100644
--- a/redbot/cogs/general/general.py
+++ b/redbot/cogs/general/general.py
@@ -28,7 +28,7 @@ class RPSParser:
         elif argument == "scissors":
             self.choice = RPS.scissors
         else:
-            raise ValueError
+            self.choice = None
 
 
 @cog_i18n(_)
@@ -121,6 +121,8 @@ class General(commands.Cog):
         """Play Rock Paper Scissors."""
         author = ctx.author
         player_choice = your_choice.choice
+        if not player_choice:
+            return await ctx.send("This isn't a valid option. Try rock, paper, or scissors.")
         red_choice = choice((RPS.rock, RPS.paper, RPS.scissors))
         cond = {
             (RPS.rock, RPS.paper): False,