--- a/src/proto2/Application.cc	Thu Nov 20 20:27:12 2008 +0000
+++ b/src/proto2/Application.cc	Thu Nov 20 22:10:28 2008 +0000
@@ -119,9 +119,13 @@
 
                 // XXX: handle --help
                 return 1;
+            } catch (CL_Error &e) {
+                std::cerr << "main: CL_Error:" << e.message << std::endl;
+
+                return 1;
 
             } catch (std::exception &e) {
-                std::cerr << e.what() << std::endl;
+                std::cerr << "FATAL [uncaught_exception] " << e.what() << std::endl;
 
                 return 1;
             }