diff --git a/src/lua/LuaComponent.cpp b/src/lua/LuaComponent.cpp
index dc2305079..a2567fb5b 100644
--- a/src/lua/LuaComponent.cpp
+++ b/src/lua/LuaComponent.cpp
@@ -83,8 +83,11 @@ int LuaComponent::visible(lua_State * l)
 
 LuaComponent::~LuaComponent()
 {
-	if(component && component->GetParentWindow())
-		component->GetParentWindow()->RemoveComponent(component);
-	delete component;
+	if (component)
+	{
+		if (component->GetParentWindow())
+			component->GetParentWindow()->RemoveComponent(component);
+		delete component;
+	}
 }
 #endif