diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
index 244df86..497e5f0 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@@ -74,8 +74,10 @@ public class RulesCommand implements Command {
                             Role role = event.getMessage().getMentionedRoles().get(0);
                             setRole(event, channel, message, event3, role);
                         } else {
-                            Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
-                            setRole(event, channel, message, event3, role);
+                            if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size()>0) {
+                                Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
+                                setRole(event, channel, message, event3, role);
+                            } // TODO
                         }
                     }, event.getJDA(), event.getAuthor());
                 }, event.getJDA(), event.getAuthor());
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 1867d79..8483647 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -29,8 +29,15 @@ public class RulesListener extends ListenerAdapter {
                         event.getMember().kick().reason("Declined the rules");
                     }
                 }
-            } else {
+            } else if (event.getReactionEmote().isEmoji()) {
+                if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) {
                     event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
+                } else if (event.getReactionEmote().getEmoji().equals(rethink.getRulesDEmote(event.getGuild().getId()))) {
+                    event.getReaction().removeReaction(event.getUser()).queue();
+                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
+                        event.getMember().kick().reason("Declined the rules");
+                    }
+                }
             }
         }
     }