--- a/libinterp/octave-value/ov-oncleanup.cc	Fri Jul 22 10:28:51 2016 -0400
+++ b/libinterp/octave-value/ov-oncleanup.cc	Fri Jul 22 12:08:51 2016 -0400
@@ -76,6 +76,8 @@
   frame.protect_var (quit_allowed);
   quit_allowed = false;
 
+  interpreter_try (frame);
+
   try
     {
       // Run the actual code.
@@ -89,12 +91,15 @@
     }
   catch (const octave_execution_exception&)
     {
-      throw;
+      std::string msg = last_error_message ();
+      warning ("onCleanup: error caught while executing cleanup function:\n%s\n",
+               msg.c_str ());
+      
     }
   catch (...) // Yes, the black hole.  We're in a d-tor.
     {
       // This shouldn't happen, in theory.
-      error ("onCleanup: internal error: unhandled exception in cleanup action");
+      warning ("onCleanup: internal error: unhandled exception in cleanup action");
     }
 }