diff --git a/com.ibm.wala.cast/source/c/include/CAstWrapper.h b/com.ibm.wala.cast/source/c/include/CAstWrapper.h
index e7b62e695..96151918b 100644
--- a/com.ibm.wala.cast/source/c/include/CAstWrapper.h
+++ b/com.ibm.wala.cast/source/c/include/CAstWrapper.h
@@ -123,6 +123,8 @@ public:
 
   CAstWrapper(JNIEnv *env, Exceptions &ex, jobject Ast);
 
+  virtual ~CAstWrapper() { }
+  
   void assertIsCAstNode(jobject, int);
 
   jobject makeNode(int);
diff --git a/com.ibm.wala.cast/source/c/include/Exceptions.h b/com.ibm.wala.cast/source/c/include/Exceptions.h
index c2bdc4b70..d5a54d926 100644
--- a/com.ibm.wala.cast/source/c/include/Exceptions.h
+++ b/com.ibm.wala.cast/source/c/include/Exceptions.h
@@ -37,7 +37,14 @@ extern "C" {
 
 #define CATCH()			\
   }				\
-}				\
+}
+
+#define START_CATCH_BLOCK()	\
+  } else {
+
+#define END_CATCH_BLOCK()	\
+  }				\
+}
 
 #define THROW(CPP_EXP_NAME, MESSAGE)	\
 (CPP_EXP_NAME).throwException(__FILE__, __LINE__, MESSAGE)