diff --git a/DataStr/List.cpp b/DataStr/List.cpp
index 4a9588dab1352559ffa6f6e8f4959ad89315f9a4..53487fd51effbcd0ea205e33aeb36783adb6d04d 100644
--- a/DataStr/List.cpp
+++ b/DataStr/List.cpp
@@ -1,4 +1,4 @@
-// $Id: List.cpp,v 1.15 2001-04-08 20:36:49 geuzaine Exp $
+// $Id: List.cpp,v 1.16 2001-05-22 07:11:14 geuzaine Exp $
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -319,6 +319,7 @@ void List_Invert(List_T *a , List_T *b)
 
 void List_Reset(List_T *liste)
 {
+  if(!liste) return;
   liste->n = 0;
 }
 
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index c7f3c3c50a6b71404936d21de43a55c74cd01b6f..a7253116eabe60400f6d78dcd16ec8758d9cfc58 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.20 2001-05-17 07:11:49 geuzaine Exp $
+// $Id: CAD.cpp,v 1.21 2001-05-22 07:11:14 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "Geo.h"
@@ -17,7 +17,7 @@ extern Context_T  CTX;
 extern int        CurrentNodeNumber;
 
 static int      MAXREG,MAXPOINT;
-static List_T  *ListOfTransformedPoints;
+static List_T  *ListOfTransformedPoints=NULL;
 
 int compare2Lists (List_T *List1, List_T *List2,
                    int (*fcmp)(const void *a, const void *b)){
@@ -596,7 +596,8 @@ static void vecmat4x4(double mat[4][4],double vec[4], double res[4]){
 void ApplyTransformationToPoint ( double matrix[4][4], Vertex *v ){
   double pos[4],vec[4];
 
-  if(!ListOfTransformedPoints)ListOfTransformedPoints = List_Create(2,2,sizeof(int));
+  if(!ListOfTransformedPoints)
+    ListOfTransformedPoints = List_Create(2,2,sizeof(int));
   
   if(!List_Search(ListOfTransformedPoints,&v->Num,fcmp_absint)){
     List_Add(ListOfTransformedPoints,&v->Num);
diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp
index 111a97daaffcc9c848e58478f4bebdeaca576f6e..e68a10c68688a74c6250dc8b9b6cf5be19c1bc16 100644
--- a/Mesh/Create.cpp
+++ b/Mesh/Create.cpp
@@ -1,4 +1,4 @@
-// $Id: Create.cpp,v 1.14 2001-05-20 19:24:53 geuzaine Exp $
+// $Id: Create.cpp,v 1.15 2001-05-22 07:11:14 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "Const.h"
@@ -474,7 +474,7 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
       if ((v = FindPoint (iPnt, THEM)))
         List_Add (pC->Control_Points, &v);
       else
-        Msg(GERROR, "Unknown control point %d in Curve %d", iPnt, pC->Num);
+        Msg(FATAL, "Unknown control point %d in Curve %d", iPnt, pC->Num);
     }
   }
   else {