diff --git a/api/boinc_opencl.cpp b/api/boinc_opencl.cpp
index b14302ea0d..4f2198a1ff 100644
--- a/api/boinc_opencl.cpp
+++ b/api/boinc_opencl.cpp
@@ -26,26 +26,14 @@
 
 #ifdef _WIN32
 #include "win_util.h"
-#else
-#include <setjmp.h>
-#include <signal.h>
 #endif
 #include <string>
 
 #include "error_numbers.h"
 #include "boinc_api.h"
-
 #include "coproc.h"
-
 #include "boinc_opencl.h"
 
-#ifndef _WIN32
-static jmp_buf resume;
-static void segv_handler(int) {
-    longjmp(resume, 1);
-}
-#endif
-
 // returns an OpenCL error num or zero
 //
 int boinc_get_opencl_ids_aux(
@@ -120,27 +108,9 @@ int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
         return ERR_NOT_FOUND;
     }
 
-#ifdef _WIN32
-    try {
-        retval = boinc_get_opencl_ids_aux(
-            aid.gpu_type, aid.gpu_device_num, device, platform
-        );
-    }
-    catch (...) {
-        return ERR_SIGNAL_CATCH;
-    }
-#else
-    void (*old_sig)(int) = signal(SIGSEGV, segv_handler);
-    if (setjmp(resume)) {
-        return ERR_SIGNAL_CATCH;
-    } else {
-        retval = boinc_get_opencl_ids_aux(
-            aid.gpu_type, aid.gpu_device_num, device, platform
-        );
-    }
+    retval = boinc_get_opencl_ids_aux(
+        aid.gpu_type, aid.gpu_device_num, device, platform
+    );
 
-    signal(SIGSEGV, old_sig);
-#endif
-    
     return retval;
 }
diff --git a/checkin_notes b/checkin_notes
index d387538944..b5acbce976 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8245,3 +8245,10 @@ Charlie 8 Nov 2011
 
     mac_installer/
         PostInstall.cpp
+
+Rom    8 Nov 2011
+    - API: Remove exception trapping stuff from the 
+        boinc_get_opencl_ids.
+        
+    api/
+        boinc_opencl.cpp