diff --git a/src/kits/interface/Layout.cpp b/src/kits/interface/Layout.cpp
index 0b168af906..a763ded243 100644
--- a/src/kits/interface/Layout.cpp
+++ b/src/kits/interface/Layout.cpp
@@ -47,7 +47,8 @@ namespace {
 
 	struct ViewRemover {
 		inline void operator()(BView* view) {
-			BView::Private(view).RemoveSelf();
+			if (view)
+				BView::Private(view).RemoveSelf();
 		}
 	};
 }