diff --git a/group02/106614649/106614649Learnin/src/com/github/Ven13/coding2017/basic/LinkedList.java b/group02/106614649/106614649Learnin/src/com/github/Ven13/coding2017/basic/LinkedList.java
index 39edb53ef1..adf30d89c2 100644
--- a/group02/106614649/106614649Learnin/src/com/github/Ven13/coding2017/basic/LinkedList.java
+++ b/group02/106614649/106614649Learnin/src/com/github/Ven13/coding2017/basic/LinkedList.java
@@ -85,6 +85,9 @@ public Object get(int index) {
 
 	@Override
 	public Object remove(int index) {
+		if(size == 0) {
+			throw new java.util.NoSuchElementException();  
+		}
 		if(index == 0) {
 			Node node = head;
 			Node temp = node.next;