3 files changed, 10 insertions, 5 deletions

diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 72c05b0..1987ea5 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -701,12 +701,14 @@ void MineField::readConfig(Config& cfg)
         mineguess=0;
         for ( x = 0; x < numCols; x++ ) {
             for ( int y = 0; y < numRows; y++ ) {
                 char code='A'+(x*17+y*101)%21; // Reduce the urge to cheat
                 int st = (char)(QChar)grid[i++]-code;
                 Mine* m = mine( y, x );
+                if (!m)
+                    continue;
                 if ( st >= 5 ) {
                     st-=5;
                     m->setMined(TRUE);
                     minecount++;
                     mineguess++;
                 }
@@ -725,13 +727,13 @@ void MineField::readConfig(Config& cfg)
                 }
             }
         }
         for ( x = 0; x < numCols; x++ ) {
             for ( int y = 0; y < numRows; y++ ) {
                 Mine* m = mine( y, x );
-                if ( m->state() == Mine::Empty )
+                if ( m && m->state() == Mine::Empty )
                     m->setHint(getHint(y,x));
             }
         }
     }
     setState( Playing );
     emit mineCount( mineguess );
diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp
index c8d7869..d87ff80 100644
--- a/noncore/net/opieirc/ircsession.cpp
+++ b/noncore/net/opieirc/ircsession.cpp
@@ -137,15 +137,17 @@ void IRCSession::updateNickname(const QString &oldNickname, const QString &newNi
         output = IRCOutput(OUTPUT_NICKCHANGE, tr("%1 is now known as %2").arg(oldNickname).arg(newNickname));
     }
 
     QListIterator<IRCChannel> it(channels);
     for (;it.current(); ++it) {
         IRCChannelPerson *chanperson = it.current()->getPerson(oldNickname);
-        it.current()->removePerson(chanperson);
-        chanperson->setNick(newNickname);
-        it.current()->addPerson(chanperson);
+        if (chanperson) {
+            it.current()->removePerson(chanperson);
+            chanperson->setNick(newNickname);
+            it.current()->addPerson(chanperson);
+        }
     }
 
     emit updateChannels();
     output.addParam(new QString(newNickname));
     emit outputReady(output);
 }
diff --git a/noncore/todayplugins/stockticker/libstocks/csv.c b/noncore/todayplugins/stockticker/libstocks/csv.c
index 6170bed..86d8607 100644
--- a/noncore/todayplugins/stockticker/libstocks/csv.c
+++ b/noncore/todayplugins/stockticker/libstocks/csv.c
@@ -311,13 +311,14 @@ stock *parse_csv_history_file(char *csv_file)
   stock *FirstStockPtr=NULL;
 
   line = csv_file;
   end_line = csv_file;
 
   /* do not use the first line */
-  end_line = strstr(line, "\n");
+  if (!(end_line = strstr(line, "\n")))
+      return 0;
   *end_line = 0;
   end_line++;
   line = end_line;
 
   while ((end_line = strstr(line, "\n")))
     {