diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
index 3df12892..96f7cac7 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
@@ -98,11 +98,11 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
 
             if (jsonResponse.has("error")) {
                 if (jsonResponse.getInt("code") == 404) {
-                    throw new ContentNotAvailableException("No channel associated with this user"
-                            + "exists");
+                    throw new ContentNotAvailableException(
+                            "No channel associated with this user exists");
                 } else {
                     throw new ContentNotAvailableException("Got error:\""
-                            + jsonResponse.getString("status") + "\""
+                            + jsonResponse.getString("status") + "\": "
                             + jsonResponse.getString("message"));
                 }
             }
@@ -149,7 +149,7 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
                     throw new ContentNotAvailableException("This channel doesn't exist.");
                 } else {
                     throw new ContentNotAvailableException("Got error:\""
-                            + jsonResponse.getString("status") + "\""
+                            + jsonResponse.getString("status") + "\": "
                             + jsonResponse.getString("message"));
                 }
             }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java
index 92dfcf64..c87c856d 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java
@@ -75,8 +75,8 @@ public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory
     }
 
     public static String getSearchParameter(final String contentFilter) {
-        if (!isNullOrEmpty(contentFilter)) {
-            switch (contentFilter) {
+        if (isNullOrEmpty(contentFilter)) return "";
+        switch (contentFilter) {
                 case VIDEOS:
                     return "EgIQAQ%3D%3D";
                 case CHANNELS:
@@ -91,9 +91,6 @@ public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory
                 case MUSIC_ARTISTS:
                 default:
                     return "";
-            }
-        } else {
-            return "";
         }
     }
 }