diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index bd1088deb..ef81d1716 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -487,9 +487,13 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
     _containerWidget->setLayout(_layout);
 }
 void TabbedViewContainer::setNewViewMenu(QMenu* menu)
-{ _newTabButton->setDelayedMenu(menu); }
+{
+  _newTabButton->setDelayedMenu(menu); 
+}
 ViewContainer::Features TabbedViewContainer::supportedFeatures() const
-{ return QuickNewView|QuickCloseView; }
+{ 
+  return QuickNewView|QuickCloseView;
+}
 void TabbedViewContainer::setFeatures(Features features)
 {
     ViewContainer::setFeatures(features);
@@ -695,6 +699,8 @@ void TabbedViewContainer::addViewWidget( QWidget* view , int index)
 }
 void TabbedViewContainer::removeViewWidget( QWidget* view )
 {
+    if (!_stackWidget)
+        return;
     const int index = _stackWidget->indexOf(view);
 
     Q_ASSERT( index != -1 );
@@ -802,6 +808,8 @@ void StackedViewContainer::addViewWidget( QWidget* view , int )
 }
 void StackedViewContainer::removeViewWidget( QWidget* view )
 {
+    if (!_stackWidget)
+        return;
     const int index = _stackWidget->indexOf(view);
 
     Q_ASSERT( index != -1);
@@ -897,6 +905,8 @@ void ListViewContainer::addViewWidget( QWidget* view , int )
 
 void ListViewContainer::removeViewWidget( QWidget* view )
 {
+    if (!_stackWidget)
+        return;
     int index = _stackWidget->indexOf(view);
     _stackWidget->removeWidget(view);
     delete _listWidget->takeItem( index );
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
index 28d0d0076..0b4e4082b 100644
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -449,7 +449,7 @@ private:
     void setTabActivity(int index,bool activity);
 
     ViewContainerTabBar* _tabBar;
-    QStackedWidget* _stackWidget;
+    QPointer<QStackedWidget> _stackWidget;
     QPointer<QWidget> _containerWidget;
     QSpacerItem* _tabBarSpacer;
     TabbedViewContainerLayout* _layout;
@@ -477,7 +477,7 @@ protected:
 
 private:
     QPointer<QWidget> _containerWidget;
-    QStackedWidget* _stackWidget;
+    QPointer<QStackedWidget> _stackWidget;
 };
 
 /**
@@ -508,7 +508,7 @@ private slots:
 private:
     QBrush randomItemBackground(int randomIndex);
 
-    QStackedWidget* _stackWidget;
+    QPointer<QStackedWidget> _stackWidget;
     QSplitter* _splitter;
     QListWidget* _listWidget;
 };