1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/net/tylermurphy/ken/command/selfrole/Roles.java b/src/main/java/net/tylermurphy/ken/command/selfrole/Roles.java
index 238a8de..c294d82 100644
--- a/src/main/java/net/tylermurphy/ken/command/selfrole/Roles.java
+++ b/src/main/java/net/tylermurphy/ken/command/selfrole/Roles.java
@@ -7,6 +7,7 @@ import net.tylermurphy.ken.command.Response;
 import net.tylermurphy.ken.command.annotation.ButtonCallback;
 import net.tylermurphy.ken.command.annotation.Command;
 import net.tylermurphy.ken.command.annotation.SelectMenuCallback;
+import net.tylermurphy.ken.util.Checks;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -32,13 +33,11 @@ public class Roles {
 
     @ButtonCallback(name="roles")
     public Response onButton(Guild guild, String id, Message message){
-        int page;
-        if(message == null) return Response.delete();
-        if (message.getEmbeds().size() > 0 && message.getEmbeds().get(0) != null) {
-            page = Integer.parseInt(message.getEmbeds().get(0).getFooter().getText().split("/")[0].substring(5));
-        } else {
-            page = 1;
-        }
+
+        try { Checks.hasPagedEmbed(message); }
+        catch (RuntimeException e) { return Response.error(e.getMessage()); }
+
+        int page = Integer.parseInt(message.getEmbeds().get(0).getFooter().getText().split("/")[0].substring(5));
         int pages = Ken.getInstance().getDatabase().getSelfRoleData().getPages(guild.getIdLong());
         if(id.equals("previous"))
             page = page - 1 < 1 ? pages : page - 1;