diff --git a/eo/src/utils/eoRndGenerators.h b/eo/src/utils/eoRndGenerators.h
index 26d22111..57a58c69 100644
--- a/eo/src/utils/eoRndGenerators.h
+++ b/eo/src/utils/eoRndGenerators.h
@@ -68,9 +68,9 @@ template <class T = double> class eoUniformGenerator : public eoRndGenerator<T>
   // added new ctor with 2 params, and modified the data to minim and range
   // (was maxim only). MS 3/11/2000
   public :
-    eoUniformGenerator(T _max = T(1.0), eoRng& _rng = rng) :
+    eoUniformGenerator(T _max = T(1.0), eoRng& _rng = eo::rng) :
       minim(T(0.0)), range(_max), uniform(_rng) {}
-    eoUniformGenerator(T _min, T _max, eoRng& _rng = rng) :
+    eoUniformGenerator(T _min, T _max, eoRng& _rng = eo::rng) :
       minim(_min), range(_max-_min), uniform(_rng)
   {
     if (_min>_max)
@@ -104,7 +104,7 @@ bool eoUniformGenerator<bool>::operator()(void)
 class eoBooleanGenerator : public eoRndGenerator<bool>
 {
   public :
-  eoBooleanGenerator(float _bias = 0.5, eoRng& _rng = rng) : bias(_bias), gen(_rng) {}
+  eoBooleanGenerator(float _bias = 0.5, eoRng& _rng = eo::rng) : bias(_bias), gen(_rng) {}
 
   bool operator()(void) { return gen.flip(bias); }
   private :
@@ -120,7 +120,7 @@ class eoBooleanGenerator : public eoRndGenerator<bool>
 template <class T = double> class eoNormalGenerator : public eoRndGenerator<T>
 {
   public :
-    eoNormalGenerator(T _stdev = T(1.0), eoRng& _rng = rng) : stdev(_stdev), normal(_rng) {}
+    eoNormalGenerator(T _stdev = T(1.0), eoRng& _rng = eo::rng) : stdev(_stdev), normal(_rng) {}
 
   T operator()(void) { return (T) normal.normal(stdev); }
 
@@ -137,7 +137,7 @@ template <class T = double> class eoNormalGenerator : public eoRndGenerator<T>
 template <class T = double> class eoNegExpGenerator : public eoRndGenerator<T>
 {
   public :
-    eoNegExpGenerator(T _mean = 1.0, eoRng& _rng = rng) : mean(_mean), negexp(_rng) {}
+    eoNegExpGenerator(T _mean = 1.0, eoRng& _rng = eo::rng) : mean(_mean), negexp(_rng) {}
 
   T operator()(void) { return (T) negexp.negexp(mean); }
 
diff --git a/eo/test/t-eoRandom.cpp b/eo/test/t-eoRandom.cpp
index 7250a0f6..09f9b7a6 100644
--- a/eo/test/t-eoRandom.cpp
+++ b/eo/test/t-eoRandom.cpp
@@ -24,7 +24,7 @@
 */
 
 /**
-CVS Info: $Date: 2001-02-17 10:51:31 $  $Author: maartenkeijzer $ $Revision: 1.8 $
+CVS Info: $Date: 2001-02-18 04:34:57 $  $Author: evomarc $ $Revision: 1.9 $
 */
 
 //-----------------------------------------------------------------------------
@@ -38,17 +38,26 @@ CVS Info: $Date: 2001-02-17 10:51:31 $  $Author: maartenkeijzer $ $Revision: 1.8
 //-----------------------------------------------------------------------------
 
 main() {
+  try{
   eoUniformGenerator<float> u1(-2.5,3.5);
-  eoUniformGenerator<double> u2(0.003, 0.0005 );
-  eoUniformGenerator<unsigned long> u3( 10000000U, 10000U);
-  /*  eoNegExp<float> e1(3.5);
-  eoNegExp<double> e2(0.003 );
-  eoNegExp<long> e3( 10000U);
-  cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl; */
+  eoUniformGenerator<double> u2(0.0003, 0.0005 );
+  eoUniformGenerator<unsigned long> u3( 100000U, 10000000U);
+
+  eoNegExpGenerator<float> e1(3.5);
+  eoNegExpGenerator<double> e2(0.003 );
+  eoNegExpGenerator<long> e3( 10000U);
+  /*  cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl; */
   for ( unsigned i = 0; i < 100; i ++) {
-    cout << u1() << "\t" << u2() << "\t" << u3() << endl;
+    cout << "Uniform: " << u1() << "\t" << u2() << "\t" << u3() << endl;
+    cout << "NegExp: " << e1() << "\t" << e2() << "\t" << e3() << endl;
   }
+  } 
  
+  catch (exception& e)
+    {
+        cout << "exception: " << e.what() << endl;;
+        exit(EXIT_FAILURE);
+    }
   return 0; // to avoid VC++ complaints
 }