diff --git a/server/fetch.php b/server/fetch.php
index 024ad4e..9a473bc 100644
--- a/server/fetch.php
+++ b/server/fetch.php
@@ -44,16 +44,13 @@ function make_login_request($username, $password) {
 }
 
 function parse_teacher($onmouseover) {
-    $explode_on_teacher = explode("Učitel:", $onmouseover); // [0] => something, [1] => teacher and something, 0 can be ignored
-    if ($explode_on_teacher == null) {
-        $explode_on_teacher = "~ ~";
+    if ($onmouseover == null) {
+        $onmouseover = "Učitel:~ ~";
     }
+    $explode_on_teacher = explode("Učitel:", $onmouseover); // [0] => something, [1] => teacher and something, 0 can be ignored
     $explode_on_first_tilda = explode("~", $explode_on_teacher[1]);
     $explode_on_second_tilda = explode("~", $explode_on_first_tilda[1]);
     $teacher = $explode_on_second_tilda[0];
-    if ($teacher == " ") {
-        $teacher = "";
-    }
 
     if (strstr($teacher, ">")) {
         $teacher = explode("<", explode(">", $teacher)[1])[0];
@@ -87,7 +84,11 @@ function parse_cell($cell, $cell_counter, $times) {
 
     if (!$is_empty && $cell->filter("table")->filter(".KuvSuplovanaHodina")->count() == 0) {
         $name = $cell->filter(".KuvBunkaRozvrhNadpis")->first()->text();
-        $place = explode("<br>", $cell->filter(".KuvBunkaRozvrhText")->first()->html())[1];
+        $maybe_place = $cell->filter(".KuvBunkaRozvrhText")->first()->html();
+        if ($maybe_place == null) {
+            $maybe_place = "<br>";
+        }
+        $place = explode("<br>", $maybe_place)[1];
         if ($place == null) {
             $place = "";
         }