diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java b/annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java
index bfb4eb7ab87bf741be41f63801c9e3a1575f8010..155716d808c00880c3369cf3add17e0e2ea85134 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java
@@ -327,6 +327,9 @@ public class DrugbankHTMLParser extends DrugAnnotation implements IExternalServi
 
       while (pageStart > 0 && pageStart < end) {
         int targetStart = page.indexOf("Details</a>", pageStart);
+        if (targetStart < 0) {
+          break;
+        }
         int nextTargetStart = page.indexOf("Details</a>", targetStart + 1);
         if (nextTargetStart < 0) {
           nextTargetStart = end;
@@ -715,7 +718,7 @@ public class DrugbankHTMLParser extends DrugAnnotation implements IExternalServi
 
       int organismPosition = page.indexOf("Organism</dt><dd class=\"col-md-10 col-sm-8\">");
       if (organismPosition >= 0) {
-        int organismStart = organismPosition+ "Organism</dt><dd class=\"col-md-10 col-sm-8\">".length();
+        int organismStart = organismPosition + "Organism</dt><dd class=\"col-md-10 col-sm-8\">".length();
         int organismEnd = page.indexOf("<", organismStart + 1);
         String organismName = page.substring(organismStart, organismEnd);
         if (!organismMatch(organismName, organisms)) {
@@ -765,4 +768,4 @@ public class DrugbankHTMLParser extends DrugAnnotation implements IExternalServi
     super.setWebPageDownloader(webPageDownloader);
   }
 
-}
\ No newline at end of file
+}