diff --git a/pom.xml b/pom.xml
index 95996ceb779317d30ff218b0bd07efd2242f2c14..193d91b053476c7166b42838517cb57c4b94f052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.aparapi</groupId>
             <artifactId>aparapi-jni</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/src/main/java/com/aparapi/device/OpenCLDevice.java b/src/main/java/com/aparapi/device/OpenCLDevice.java
index c962ba8f7b3431a127e45c990bdc9e158647d2d1..2eabd970072893e946178de7258c5fa5eca054fb 100644
--- a/src/main/java/com/aparapi/device/OpenCLDevice.java
+++ b/src/main/java/com/aparapi/device/OpenCLDevice.java
@@ -141,15 +141,6 @@ public class OpenCLDevice extends Device implements Comparable<Device> {
     this.name = name;
   }
 
-  private static void configuratorWrapper(final IOpenCLDeviceConfigurator configurator, final OpenCLDevice device) {
-	  try {
-		  configurator.configure(device);
-	  } catch (Throwable ex) {
-		  logger.log(Level.WARNING, "Failed to configure device - Id: " + device.deviceId + 
-				  ", Name: " + device.getName(), ex);
-	  }
-  }
-  
   /**
    * Called by the underlying Aparapi OpenCL platform, upon device
    * detection.
@@ -158,7 +149,7 @@ public class OpenCLDevice extends Device implements Comparable<Device> {
 	  if (configurator != null && !underConfiguration.get() &&
 			  underConfiguration.compareAndSet(false, true)) {
 		 try {
-			 configuratorWrapper(configurator, this);
+			  configurator.configure(this);
 		 } finally {
 			 underConfiguration.set(false);
 		 }
diff --git a/src/test/java/com/aparapi/runtime/OpenCLDeviceConfiguratorTest.java b/src/test/java/com/aparapi/runtime/OpenCLDeviceConfiguratorTest.java
index 78fd2c59bfd3926de1c914da4d8a0b648d8adea0..a474894a363b5a8d39f5dd356832a89a7f73e38b 100644
--- a/src/test/java/com/aparapi/runtime/OpenCLDeviceConfiguratorTest.java
+++ b/src/test/java/com/aparapi/runtime/OpenCLDeviceConfiguratorTest.java
@@ -222,8 +222,8 @@ public class OpenCLDeviceConfiguratorTest {
     	assertEquals("Number of confgure() calls should be one", 1, callCounter.get());
     }
     
-    @Test
-    public void noExceptionConfiguratorTest() {
+    @Test(expected=IllegalArgumentException.class)
+    public void exceptionConfiguratorTestFail() {
     	final AtomicBoolean called = new AtomicBoolean(false);
     	OpenCLDevice dev = new OpenCLDevice(null, 101L, Device.TYPE.CPU);
     	IOpenCLDeviceConfigurator configurator = new IOpenCLDeviceConfigurator() {