diff --git a/resources/views/community.blade.php b/resources/views/community.blade.php
index 61397ed08..21aa98984 100755
--- a/resources/views/community.blade.php
+++ b/resources/views/community.blade.php
@@ -278,12 +278,16 @@ class="codeweek-svg-button">
 
 
         @foreach($teachers->groupBy('city_id') as $cityId => $teachersInCity)
-
-            $marker = L.marker([{{$teachersInCity[0]->city->latitude}}, {{$teachersInCity[0]->city->longitude}}]).addTo(mymap)
+            @if($teachersInCity[0]->city && $teachersInCity[0]->city->latitude && $teachersInCity[0]->city->longitude)
+        $marker = L.marker([{{$teachersInCity[0]->city->latitude}}, {{$teachersInCity[0]->city->longitude}}]).addTo(mymap)
 
         $teachersList = "";
         @foreach($teachersInCity as $teacher)
-            $teachersList = $teachersList + "&#9679;&nbsp;<b><a href=\"mailto:{{$teacher->email}}\">{{$teacher->firstname}} {{$teacher->lastname}}</a></b> ({{$teacher->city->city}}) <br/>{{implode(", ",$teacher->expertises->pluck('name')->toArray())}}<br/><br/>"
+            $teachersList = $teachersList + "&#9679;&nbsp;<b><a href=\"mailto:{{$teacher->email}}\">{{$teacher->firstname}} {{$teacher->lastname}}</a></b> ({{$teacher->city ? $teacher->city->city : 'Unknown Location'}}) <br/>{{implode(", ",$teacher->expertises->pluck('name')->toArray())}}<br/><br/>"
+        @endforeach
+
+        $marker.bindPopup($teachersList).openPopup();
+    @endif
         @endforeach