2 files changed, 9 insertions, 7 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
@@ -35,3 +35,4 @@ int main( int argc, char ** argv )
 #ifdef QWS
-    if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+    if ( QWSServer::mouseHandler() &&
+         QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 #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
@@ -109,3 +109,3 @@ int main ( int argc, char **argv )
 
-                ::signal ( SIGTERM, sigterm );
+        ::signal ( SIGTERM, sigterm );
         ::signal ( SIGINT, sigterm );
@@ -162,3 +162,3 @@ int main ( int argc, char **argv )
                                 qApp = 0;
-                                
+
                                 ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
@@ -189,3 +189,3 @@ int main ( int argc, char **argv )
                                 QString user = cfg. readEntry ( "AutoLogin" );
-                                
+
                                 if ( !user. isEmpty ( ))
@@ -193,3 +193,3 @@ int main ( int argc, char **argv )
                         }
-                
+
                         if ( autolog && !userExited ) {
@@ -201,3 +201,3 @@ int main ( int argc, char **argv )
                 LoginApplication::setLoginAs ( autolog );
-  
+
 
@@ -342,3 +342,4 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
-        if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+        if ( QWSServer::mouseHandler() &&
+             QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
                 if ( !QFile::exists ( "/etc/pointercal" )) {