diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index c70929d..06b9485 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -60,7 +60,7 @@ public class JavaParser  extends Parser<JavaElement> {
 							i = j-1;
 						}else if(Character.isWhitespace(c)) continue;
 						else{
-							if(c == '/' && line.charAt(i+1) == '/') break;
+							if(c == '/' && (i == line.length()-1 || line.charAt(i+1) == '/')) break;
 							token = new Token(lineNumber, i+1, ""+c, TokenType.DELIMITER);
 						}
 						this.tokens.add(token);