diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
index 3827b92..2062da6 100644
--- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
@@ -224,7 +224,7 @@ public class AlbumServlet
         }
 
         try {
-            if (pathInfo != null && pathInfo.startsWith(basePrefix)) {
+            if (pathInfo.startsWith(basePrefix)) {
                 pathInfo = pathInfo.substring(basePrefix.length());
             } else if (pathInfo.equals("/search")) {
                 handleSearch(req, res, (DirectoryEntry)resolveEntry("/"));