diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/JagodibujaRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/JagodibujaRipper.java
index c7f7df71..d5df1fe5 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/JagodibujaRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/JagodibujaRipper.java
@@ -50,6 +50,12 @@ public class JagodibujaRipper extends AbstractHTMLRipper {
     public List<String> getURLsFromPage(Document doc) {
         List<String> result = new ArrayList<>();
         for (Element comicPageUrl : doc.select("div.gallery-icon > a")) {
+            // Check if the ripper has been stopped
+            try {
+                stopCheck();
+            } catch (IOException e) {
+                return result;
+            }
             try {
                 sleep(500);
                 Document comicPage = Http.url(comicPageUrl.attr("href")).get();
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/JagodibujaRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/JagodibujaRipperTest.java
index db928e17..a179aa90 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/JagodibujaRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/JagodibujaRipperTest.java
@@ -6,5 +6,9 @@ import java.net.URL;
 import com.rarchives.ripme.ripper.rippers.JagodibujaRipper;
 
 public class JagodibujaRipperTest extends RippersTest {
-    // TODO add a test
+    public void testJagodibujaRipper() throws IOException {
+        // a photo set
+        JagodibujaRipper ripper = new JagodibujaRipper(new URL("http://www.jagodibuja.com/comic-in-me/"));
+        testRipper(ripper);
+    }
 }
\ No newline at end of file