2 files changed, 4 insertions, 2 deletions

diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp
index 1c295eb..ec9b5ec 100644
--- a/core/apps/calibrate/main.cpp
+++ b/core/apps/calibrate/main.cpp
@@ -24,23 +24,24 @@
 #include <qpe/qpeapplication.h>
 
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 
 int main( int argc, char ** argv )
 {
     QPEApplication a( argc, argv );
     int retval = 0;
 
 #ifdef QWS
-    if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+    if ( QWSServer::mouseHandler() &&
+         QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 #endif
         // Make sure calibration widget starts on top.
         Calibrate cal;
         a.setMainWidget(&cal);
         a.showMainWidget(&cal);
         return a.exec();
 #ifdef QWS
     }
 #endif
 }
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7dcb5f6..2103216 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -331,25 +331,26 @@ namespace Opie { extern int force_appearance; }  // HACK to get around the force
 int login_main ( int argc, char **argv, pid_t ppid )
 {
         QWSServer::setDesktopBackground( QImage() );
         LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
         Opie::force_appearance = 0;
 
         app-> setFont ( QFont ( "Helvetica", 10 ));
         app-> setStyle ( new QPEStyle ( ));
 
         ODevice::inst ( )-> setSoftSuspend ( true );
 
-        if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+        if ( QWSServer::mouseHandler() &&
+             QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
                 if ( !QFile::exists ( "/etc/pointercal" )) {
                         // Make sure calibration widget starts on top.
                         Calibrate *cal = new Calibrate;
                         cal-> exec ( );
                         delete cal;
                 }
         }
 
         LoginScreenSaver *saver = new LoginScreenSaver;
 
         saver-> setIntervals ( );
         QWSServer::setScreenSaver ( saver );