diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceException.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceException.java
deleted file mode 100644
index 0a585033d..000000000
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.avaje.ebeaninternal.server.lib.sql;
-
-
-
-/**
- * A general DataSource exception.
- */
-public class DataSourceException extends RuntimeException
-{
-    static final long serialVersionUID = 7061559938704539844L;
-    
-	public DataSourceException(Exception cause) {
-		super(cause);
-	}
-	
-    public DataSourceException(String s, Exception cause) {
-		super(s, cause);
-	}
-
-	public DataSourceException(String s) {
-		super(s);
-	}
-
-}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
index f5e940e45..9e2eb66aa 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
@@ -221,7 +221,7 @@ public class DataSourcePool implements DataSource {
         try {
             initialise();
         } catch (SQLException ex) {
-            throw new DataSourceException(ex);
+            throw new RuntimeException(ex);
         }
     }
     
@@ -248,7 +248,7 @@ public class DataSourcePool implements DataSource {
         try {
             return (DataSourcePoolListener)ClassUtil.newInstance(cn, this.getClass());
         } catch (Exception e) {
-            throw new DataSourceException(e);
+            throw new IllegalArgumentException(e);
         }
     }