diff --git a/classpath/java/io/BufferedReader.java b/classpath/java/io/BufferedReader.java
index 7b8e940681..9c77a3246a 100644
--- a/classpath/java/io/BufferedReader.java
+++ b/classpath/java/io/BufferedReader.java
@@ -45,7 +45,7 @@ public class BufferedReader extends Reader {
         if (buffer[i] == '\n' || buffer[i] == '\r') {
           sb.append(buffer, position, i - position);
           position = i + 1;
-          if(buffer[i+1] != null && buffer[i+1] == '\n') {
+          if(i+1 < limit && buffer[i+1] == '\n') {
             position = i + 1;
           }
           return sb.toString();