diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
index 0d09ef95..b93ec186 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
@@ -101,7 +101,10 @@ public class HelpController {
             List<String> lines = new ArrayList<>(LOG_LINES_TO_SHOW);
             ReversedLinesFileReader reader = new ReversedLinesFileReader(logFile, Charset.defaultCharset());
             String current;
-            while((current = reader.readLine()) != null && lines.size() < LOG_LINES_TO_SHOW) {
+            while((current = reader.readLine()) != null) {
+                if (lines.size() >= LOG_LINES_TO_SHOW) {
+                  break;
+                }
                 lines.add(0, current);
             }
             return lines;
diff --git a/checkstyle.xml b/checkstyle.xml
index 02c0ae33..23fe8ed5 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -26,5 +26,6 @@
         <module name="AnnotationLocation"/>
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
+        <module name="InnerAssignment"/>
     </module>
 </module>