diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/KernelRunner.java b/com.amd.aparapi/src/java/com/amd/aparapi/KernelRunner.java
index 93fd87a53b6a40dfbe20b3006f747b0c7d99a97d..8091cf52a399be44bcf0005353196d723903fc02 100644
--- a/com.amd.aparapi/src/java/com/amd/aparapi/KernelRunner.java
+++ b/com.amd.aparapi/src/java/com/amd/aparapi/KernelRunner.java
@@ -1591,19 +1591,21 @@ class KernelRunner{
    
                   try {
                      executeOpenCL(_entrypointName, _range, _passes);
-                  } catch (AparapiException e) {
+                  } catch (final AparapiException e) {
                      warnFallBackAndExecute(_entrypointName, _range, _passes, e);
                   }
                } else {
                   warnFallBackAndExecute(_entrypointName, _range, _passes, "failed to locate entrypoint");
                }
+            } else {
+               try {
+                  executeOpenCL(_entrypointName, _range, _passes);
+               } catch (final AparapiException e) {
+                  warnFallBackAndExecute(_entrypointName, _range, _passes, e);
+               }
             }
          } else {
-            try {
-               executeOpenCL(_entrypointName, _range, _passes);
-            } catch (AparapiException e) {
-               warnFallBackAndExecute(_entrypointName, _range, _passes, e);
-            }
+              warnFallBackAndExecute(_entrypointName, _range, _passes, "OpenCL was requested but Device supplied was not an OpenCLDevice");
          }
       } else {
          executeJava(_range, _passes);