diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Request.java b/extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Request.java
index 05a992782..160504452 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Request.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Request.java
@@ -32,15 +32,8 @@ public class Request {
                    @Nullable final byte[] dataToSend,
                    @Nullable final Localization localization,
                    final boolean automaticLocalizationHeader) {
-        if (httpMethod == null) {
-            throw new IllegalArgumentException("Request's httpMethod is null");
-        }
-        if (url == null) {
-            throw new IllegalArgumentException("Request's url is null");
-        }
-
-        this.httpMethod = httpMethod;
-        this.url = url;
+        this.httpMethod = Objects.requireNonNull(httpMethod, "Request's httpMethod is null");
+        this.url = Objects.requireNonNull(url, "Request's url is null");
         this.dataToSend = dataToSend;
         this.localization = localization;
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java
index 1c6ae2abc..043249386 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java
@@ -3,6 +3,8 @@ package org.schabi.newpipe.extractor.linkhandler;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.utils.Utils;
 
+import java.util.Objects;
+
 /*
  * Created by Christian Schabesberger on 26.07.16.
  *
@@ -72,9 +74,7 @@ public abstract class LinkHandlerFactory {
      * @return a {@link LinkHandler} complete with information
      */
     public LinkHandler fromUrl(final String url, final String baseUrl) throws ParsingException {
-        if (url == null) {
-            throw new IllegalArgumentException("URL cannot be null");
-        }
+        Objects.requireNonNull(url, "URL cannot be null");
         if (!acceptUrl(url)) {
             throw new ParsingException("URL not accepted: " + url);
         }
@@ -84,17 +84,13 @@ public abstract class LinkHandlerFactory {
     }
 
     public LinkHandler fromId(final String id) throws ParsingException {
-        if (id == null) {
-            throw new IllegalArgumentException("id can not be null");
-        }
+        Objects.requireNonNull(id, "ID cannot be null");
         final String url = getUrl(id);
         return new LinkHandler(url, url, id);
     }
 
     public LinkHandler fromId(final String id, final String baseUrl) throws ParsingException {
-        if (id == null) {
-            throw new IllegalArgumentException("id can not be null");
-        }
+        Objects.requireNonNull(id, "ID cannot be null");
         final String url = getUrl(id, baseUrl);
         return new LinkHandler(url, url, id);
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java
index 0d67fe6e1..c311ade0a 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java
@@ -5,6 +5,7 @@ import org.schabi.newpipe.extractor.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
 
@@ -35,10 +36,7 @@ public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
 
     @Override
     public ListLinkHandler fromUrl(final String url, final String baseUrl) throws ParsingException {
-        if (url == null) {
-            throw new IllegalArgumentException("url may not be null");
-        }
-
+        Objects.requireNonNull(url, "URL may not be null");
         return new ListLinkHandler(super.fromUrl(url, baseUrl));
     }