From c0d630bee29f1e7e80670532db48a20de3f91944 Mon Sep 17 00:00:00 2001
From: Hoang Pham <hoang.pham@molecula.com>
Date: Thu, 30 Jun 2022 16:23:27 -0500
Subject: [PATCH] FB-1505 - check if view 'standard' exists

---
 server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.go b/server.go
index 352497f1b..a187133ca 100644
--- a/server.go
+++ b/server.go
@@ -898,8 +898,8 @@ func (s *Server) ViewsRemoval(ctx context.Context) {
 						}
 					}
 				}
-				if field.Options().NoStandardView {
-					// delete view "standard" if NoStandardView is true
+				if field.Options().NoStandardView && field.view(viewStandard) != nil {
+					// delete view "standard" if NoStandardView is true and view "standard" exists
 					for _, shard := range field.AvailableShards(true).Slice() {
 						err := s.holder.txf.DeleteFragmentFromStore(index.Name(), field.Name(), viewStandard, shard, nil)
 						if err != nil {