diff --git a/source/net/yacy/data/BookmarksDB.java b/source/net/yacy/data/BookmarksDB.java
index e2237a165..c9526697b 100644
--- a/source/net/yacy/data/BookmarksDB.java
+++ b/source/net/yacy/data/BookmarksDB.java
@@ -513,7 +513,7 @@ public class BookmarksDB {
         }
 
         public Bookmark(final String url) throws MalformedURLException {
-            this(new DigestURI((!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) ? "http://" + url : url));
+            this(new DigestURI((url.indexOf("://") < 0) ? "http://" + url : url));
         }
 
         public Bookmark(final Map<String, String> map) throws MalformedURLException {
diff --git a/source/net/yacy/search/index/SolrConfiguration.java b/source/net/yacy/search/index/SolrConfiguration.java
index 4b4df69b4..c5f48e65f 100644
--- a/source/net/yacy/search/index/SolrConfiguration.java
+++ b/source/net/yacy/search/index/SolrConfiguration.java
@@ -333,7 +333,7 @@ public class SolrConfiguration extends ConfigurationSet implements Serializable
         String host = null;
         if ((host = digestURI.getHost()) != null) {
             String dnc = Domains.getDNC(host);
-            String subdomOrga = host.substring(0, host.length() - dnc.length() - 1);
+            String subdomOrga = host.length() - dnc.length() <= 0 ? "" : host.substring(0, host.length() - dnc.length() - 1);
             int p = subdomOrga.lastIndexOf('.');
             String subdom = (p < 0) ? "" : subdomOrga.substring(0, p);
             String orga = (p < 0) ? subdomOrga : subdomOrga.substring(p + 1);