diff --git a/mapview/3D/MapView3D.cpp b/mapview/3D/MapView3D.cpp
index e97b952..245503d 100644
--- a/mapview/3D/MapView3D.cpp
+++ b/mapview/3D/MapView3D.cpp
@@ -113,9 +113,7 @@ void MapView3D::paintGL() {
 //	// 1) translate into center
 //	glTranslatef(tra.x, tra.y, tra.z);
 
-	if (gridModel) {
-		draw();
-	}
+	draw();
 
 
 }
@@ -249,11 +247,11 @@ void MapView3D::draw() {
 
 	}
 
-	if (showGrid) {
+	if (showGrid && gridModel) {
 		gridRenderer->paintGL(gridModel->getGrid());
 	}
 
-	if (showNavMesh) {
+	if (showNavMesh && navMeshModel) {
 		navMeshRenderer->paintGL(navMeshModel->getNavMesh(), this);
 	}