diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java
index 4623df98..c58a7e71 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java
@@ -130,8 +130,8 @@ public class FlickrRipper extends AbstractHTMLRipper {
         String apiURL = null;
         try {
             apiURL = apiURLBuilder(getAlbum(url.toExternalForm()), page, apiKey);
-            pageURL = new URL(apiURL);
-        }  catch (MalformedURLException e) {
+            pageURL = new URI(apiURL).toURL();
+        }  catch (MalformedURLException | URISyntaxException e) {
             LOGGER.error("Unable to get api link " + apiURL + " is malformed");
         }
         try {
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
index fb071129..0f69c75b 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
@@ -11,6 +11,7 @@ import org.jsoup.select.Elements;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -164,10 +165,10 @@ public class HqpornerRipper extends AbstractHTMLRipper {
 				}
 
 				if (downloadUrl != null) {
-					addURLToDownload(new URL(downloadUrl), "", subdirectory, "", null, getVideoName(), "mp4");
+					addURLToDownload(new URI(downloadUrl).toURL(), "", subdirectory, "", null, getVideoName(), "mp4");
 				}
 
-			} catch (IOException e) {
+			} catch (IOException | URISyntaxException e) {
 				LOGGER.error("[!] Exception while downloading video.", e);
 			}
 		}
@@ -215,7 +216,7 @@ public class HqpornerRipper extends AbstractHTMLRipper {
 
 			try {
 				logger.info("Trying to download from unknown video host " + videoPageurl);
-				URL url = new URL(videoPageurl);
+				URL url = new URI(videoPageurl).toURL();
 				Response response = Http.url(url).referrer(hqpornerVideoPageUrl).response();
 				Document doc = response.parse();
 
@@ -245,7 +246,7 @@ public class HqpornerRipper extends AbstractHTMLRipper {
 					}
 				}
 
-			} catch (IOException e) {
+			} catch (IOException | URISyntaxException e) {
 				logger.error("Unable to get video url using generic methods.");
 			}