@@ -5,7 +5,7 @@ export * from "../layout-base";
 
 function validateArgs(element: View): View {
     if (!element) {
-        throw new Error("element cannot be null or undefinied.");
+        throw new Error("element cannot be null or undefined.");
     }
     return element;
 }
@@ -291,7 +291,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
     }
 
     protected invalidate(): void {
-        // handled natively in android and overriden in ios.
+        // handled natively in android and overridden in ios.
     }
 
     set rows(value: string) {
 
@@ -136,6 +136,10 @@ export class GridLayout extends GridLayoutBase {
 
         this.eachLayoutChild((child, last) => {
             let measureSpecs = this.map.get(child);
+            if (!measureSpecs) {
+                return;
+            }
+
             this.updateMeasureSpecs(child, measureSpecs);
             this.helper.addMeasureSpec(measureSpecs);
         });
 
@@ -131,12 +131,12 @@ export class ProxyViewContainer extends LayoutBase implements ProxyViewContainer
         const oldLayout = <LayoutBase>oldParent;
 
         if (addingToParent && newLayout instanceof LayoutBase) {
-            this.eachChildView((child) => {
+            this.eachLayoutChild((child) => {
                 newLayout._registerLayoutChild(child);
                 return true;
             });
         } else if (oldLayout instanceof LayoutBase) {
-            this.eachChildView((child) => {
+            this.eachLayoutChild((child) => {
                 oldLayout._unregisterLayoutChild(child);
                 return true;
             });
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export * from "../layout-base";`
`5`	`5`
`6`	`6`	`function validateArgs(element: View): View {`
`7`	`7`	`if (!element) {`
`8`		`- throw new Error("element cannot be null or undefinied.");`
	`8`	`+ throw new Error("element cannot be null or undefined.");`
`9`	`9`	`}`
`10`	`10`	`return element;`
`11`	`11`	`}`
`@@ -291,7 +291,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`protected invalidate(): void {`
`294`		`- // handled natively in android and overriden in ios.`
	`294`	`+ // handled natively in android and overridden in ios.`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`set rows(value: string) {`