diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs
index 9610b50b68..8aecf12015 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs
@@ -48,6 +48,16 @@ namespace FancyZonesEditor
 
             public void CalcAdjacentZones(int index, int size, List<RowColInfo> info, Func<int, bool> indexCmpr)
             {
+                if (info == null)
+                {
+                    throw new ArgumentNullException(nameof(info));
+                }
+
+                if (indexCmpr == null)
+                {
+                    throw new ArgumentNullException(nameof(indexCmpr));
+                }
+
                 int ind = index;
                 while (ind > 0 && indexCmpr(ind))
                 {