1 files changed, 10 insertions, 0 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 415259e..1adb43d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -3,12 +3,13 @@
 #include <qmenubar.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qtoolbar.h>
 #include <qpe/resource.h>
 #include <opie/ofiledialog.h>
+#include <qmessagebox.h>
 
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "metafactory.h"
 #include "profile.h"
@@ -306,12 +307,21 @@ void MainWindow::slotProfile( int id) {
     Profile prof = manager()->profile( m_sessionsPop->text( id)  );
     create( prof );
 }
 void MainWindow::create( const Profile& prof ) {
     Session *ses = manager()->fromProfile( prof, tabWidget() );
 
+    if((!ses) || (!ses->layer()) || (!ses->widgetStack()))
+        {
+                QMessageBox::warning(this,
+                        QObject::tr("Session failed"),
+                        QObject::tr("Cannot open session: Not all components were found."));
+                //if(ses) delete ses;
+                return;
+        }
+
     m_sessions.append( ses );
     tabWidget()->add( ses );
     m_curSession = ses;
 
 }