X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=508d30b719e687a2b45615f28972860428d89c3c;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hp=6c9e15c3e1ee8766a45635f129a259e6f0f41226;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index 6c9e15c..508d30b 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -201,7 +201,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * @return The parsed phrases
 	 */
 	private static List<Phrase> parseSearchPhrases(String query) {
-		List<String> parsedPhrases = null;
+		List<String> parsedPhrases;
 		try {
 			parsedPhrases = StringEscaper.parseLine(query);
 		} catch (TextException te1) {
@@ -354,7 +354,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getAlbumId(String phrase) {
 		String albumId = phrase.startsWith("album://") ? phrase.substring(8) : phrase;
-		return (webInterface.getCore().getAlbum(albumId, false) != null) ? albumId : null;
+		return (webInterface.getCore().getAlbum(albumId) != null) ? albumId : null;
 	}
 
 	/**
@@ -581,7 +581,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public boolean apply(Hit<?> hit) {
-				return hit.getScore() > 0;
+				return (hit != null) && (hit.getScore() > 0);
 			}
 
 		};