diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/BooruRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/BooruRipper.java
index 974a00618..cda7c05ad 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/BooruRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/BooruRipper.java
@@ -99,9 +99,11 @@ private String getTerm(URL url) throws MalformedURLException {
     @Override
     public String getGID(URL url) throws MalformedURLException {
         try {
-            return Utils.filesystemSafe(new URI(getTerm(url).replaceAll("&tags=", "")).getPath());
-        } catch (URISyntaxException ex) {
-            logger.error(ex);
+            // Get the search term and make it filesystem safe
+            String term = getTerm(url).replaceAll("&tags=", "");
+            return Utils.filesystemSafe(term);
+        } catch (Exception ex) {
+            logger.error("Error getting GID from URL: " + url, ex);
         }
 
         throw new MalformedURLException("Expected xbooru.com URL format: " + getHost() + ".com/index.php?tags=searchterm - got " + url + " instead");