6 files changed, 11 insertions, 11 deletions
diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala
index d652556722..a5e69d5471 100644
--- a/src/dbc/scala/dbc/datatype/Factory.scala
+++ b/src/dbc/scala/dbc/datatype/Factory.scala
@@ -234,17 +234,17 @@ object Factory {
       }
       /* Unsupported data types. */
       case REF | ARRAY | STRUCT =>
-        error ("I don't support composite data types yet.");
+        system.error ("I don't support composite data types yet.");
       case DATALINK | DISTINCT | JAVA_OBJECT | NULL =>
-        error ("I won't support strange data types.");
+        system.error ("I won't support strange data types.");
       /* Unsupported binary string data types. */
       case BINARY | BLOB | LONGVARBINARY | VARBINARY =>
-        error ("I don't support binary string data types yet.");
+        system.error ("I don't support binary string data types yet.");
       /* Unsupported date and time data types. */
       case DATE | TIME | TIMESTAMP =>
-        error ("I don't support date and time data types yet.");
+        system.error ("I don't support date and time data types yet.");
       /* Default case */
-      case x => error ("I don't know about this ("+metadata.getColumnTypeName(index)+") JDBC type.")
+      case x => system.error ("I don't know about this ("+metadata.getColumnTypeName(index)+") JDBC type.")
     }
   }
 }
diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala
index ef8ab1036c..21afaea22d 100644
--- a/src/dbc/scala/dbc/datatype/Unknown.scala
+++ b/src/dbc/scala/dbc/datatype/Unknown.scala
@@ -29,6 +29,6 @@ class Unknown extends DataType {
 
   /** A SQL-99 compliant string representation of the type. */
   override def sqlString: java.lang.String =
-    error("The 'UNKNOWN' data type cannot be represented.");
+    system.error("The 'UNKNOWN' data type cannot be represented.");
 
 }
diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala
index 45f3b625d8..0427269ffd 100644
--- a/src/dbc/scala/dbc/result/Relation.scala
+++ b/src/dbc/scala/dbc/result/Relation.scala
@@ -75,7 +75,7 @@ abstract class Relation extends AnyRef with Iterable[Tuple] {
         resultNext = result.next()
         newTuple
       }
-      else error("next on empty iterator")
+      else system.error("next on empty iterator")
     }
   }
 
diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala
index 1e432e2277..07d7d26c6f 100644
--- a/src/dbc/scala/dbc/statement/Select.scala
+++ b/src/dbc/scala/dbc/statement/Select.scala
@@ -67,7 +67,7 @@ abstract class Select extends Relation {
                  ((name:String, dc:DerivedColumn) => name + ", " + dc.sqlString))
     }) +
     (fromClause match {
-      case Nil => error("Empty from clause is not allowed")
+      case Nil => system.error("Empty from clause is not allowed")
       case _ => (" FROM " + fromClause.tail.foldLeft(fromClause.head.sqlInnerString)
       ((name:String, rel:Relation) => name + ", " + rel.sqlInnerString))
     }) +
@@ -78,7 +78,7 @@ abstract class Select extends Relation {
     (groupByClause match {
       case None => ""
       case Some(gbl) => gbl match {
-        case Nil => error("Empty group by clause is not allowed")
+        case Nil => system.error("Empty group by clause is not allowed")
         case _ =>
           (" GROUP BY " +
            gbl.tail.foldLeft(gbl.head.sqlInnerString)
diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala
index 36061b013c..48a675a405 100644
--- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala
+++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala
@@ -35,6 +35,6 @@ object SetFunction {
     );
   }
   abstract class Binary extends SetFunction {
-    def sqlString = error("Binary set function is not supported yet.");
+    def sqlString = system.error("Binary set function is not supported yet.");
   }
 }
diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala
index 46e8a39e42..2c56bbf36e 100644
--- a/src/dbc/scala/dbc/value/Unknown.scala
+++ b/src/dbc/scala/dbc/value/Unknown.scala
@@ -16,7 +16,7 @@ abstract class Unknown extends Value {
 
   val dataType: datatype.Unknown;
 
-  def sqlString = error ("An 'ANY' value cannot be represented.");
+  def sqlString = system.error("An 'ANY' value cannot be represented.");
 
 }