diff --git a/u5/kindergarten_garden.py b/u5/kindergarten_garden.py
index 3688cce..a92128c 100644
--- a/u5/kindergarten_garden.py
+++ b/u5/kindergarten_garden.py
@@ -8,10 +8,13 @@ class Garden:
         self.row1 = rows[0]
         self.row2 = rows[1]
 
-        self.students = [
-            "Alena", "Boris", "Cyril", "Daniel", "Eva", "František",
-            "Gitka", "Helena", "Ivana", "Jozef", "Karol", "Ladislav"
-        ]
+        if students is None:
+            self.students = [
+                "Alena", "Boris", "Cyril", "Daniel", "Eva", "František",
+                "Gitka", "Helena", "Ivana", "Jozef", "Karol", "Ladislav"
+            ]
+        else:
+            self.students = sorted(students)
 
         self.plant_names = {
             "G": "Tráva",
@@ -21,6 +24,9 @@ class Garden:
         }
 
     def plants(self, student):
+        if student in self.students:
+            raise NoSuchStudentException()
+
         index = self.students.index(student)
         pos = index * 2