diff --git a/src/controls/QskItem.cpp b/src/controls/QskItem.cpp
index 9a89189b..c0b83dde 100644
--- a/src/controls/QskItem.cpp
+++ b/src/controls/QskItem.cpp
@@ -890,7 +890,6 @@ void QskItem::itemChange( QQuickItem::ItemChange change,
                     qskFilterWindow( changeData.window );
             }
 
-#if 1
             auto oldWindow = qskReleasedWindowCounter->window();
 
             if ( oldWindow && oldWindow->contentItem()
@@ -921,9 +920,6 @@ void QskItem::itemChange( QQuickItem::ItemChange change,
                     wd->activeFocusItem = nullptr;
                 }
             }
-#endif
-
-#if 1
             if ( changeData.window == nullptr )
             {
                 Q_D( QskItem );
@@ -942,7 +938,6 @@ void QskItem::itemChange( QQuickItem::ItemChange change,
                     d->focus = false;
                 }
             }
-#endif
 
             QskWindowChangeEvent event( oldWindow, changeData.window );
             QCoreApplication::sendEvent( this, &event );
@@ -957,14 +952,7 @@ void QskItem::itemChange( QQuickItem::ItemChange change,
         case QQuickItem::ItemVisibleHasChanged:
         {
             Q_D( QskItem );
-#if 1
-            /*
-                ~QQuickItem sends QQuickItem::ItemVisibleHasChanged recursively
-                to all childItems. When being a child ( not only a childItem() )
-                we are short before being destructed too and any updates
-                done here are totally pointless. TODO ...
-             */
-#endif
+
             if ( changeData.boolValue )
             {
                 if ( d->blockedPolish )
diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp
index 876ce864..e252ff5e 100644
--- a/src/controls/QskQuick.cpp
+++ b/src/controls/QskQuick.cpp
@@ -61,6 +61,9 @@ bool qskIsItemComplete( const QQuickItem* item )
 
 bool qskIsItemInDestructor( const QQuickItem* item )
 {
+    if ( item == nullptr )
+        return false;
+
     auto d = QQuickItemPrivate::get( item );
 
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 5, 0 )