diff --git a/src/api/java/AST.java b/src/api/java/AST.java
index 6b5493bf9..dc73c7ae7 100644
--- a/src/api/java/AST.java
+++ b/src/api/java/AST.java
@@ -33,7 +33,7 @@ public class AST extends Z3Object implements Comparable
     {
         AST casted = null;
 
-	try
+        try
         {
             casted = AST.class.cast(o);
         } catch (ClassCastException e)
@@ -41,13 +41,12 @@ public class AST extends Z3Object implements Comparable
             return false;
         }
 
-	return  
-	    (this == casted) || 
-	    (this != null) &&
-	    (casted != null) &&
-	    (getContext().nCtx() == casted.getContext().nCtx()) &&
-	    (Native.isEqAst(getContext().nCtx(), getNativeObject(), casted.getNativeObject()));
-}
+        return  (this == casted) ||
+                (this != null) &&
+                (casted != null) &&
+                (getContext().nCtx() == casted.getContext().nCtx()) &&
+                (Native.isEqAst(getContext().nCtx(), getNativeObject(), casted.getNativeObject()));
+    }
 
     /**
      * Object Comparison. 
diff --git a/src/api/java/Constructor.java b/src/api/java/Constructor.java
index 2ceaddcff..26b33ed35 100644
--- a/src/api/java/Constructor.java
+++ b/src/api/java/Constructor.java
@@ -80,11 +80,20 @@ public class Constructor extends Z3Object
 
     /**
      * Destructor.
+     * @throws Throwable 
      * @throws Z3Exception on error
      **/
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
-        Native.delConstructor(getContext().nCtx(), getNativeObject());
+        try {
+            Native.delConstructor(getContext().nCtx(), getNativeObject());
+        }
+        catch (Throwable t) {
+            throw t;
+        }
+        finally {
+            super.finalize();
+        }
     }
 
     private int n = 0;
diff --git a/src/api/java/ConstructorList.java b/src/api/java/ConstructorList.java
index 2b3aa94e2..82b119513 100644
--- a/src/api/java/ConstructorList.java
+++ b/src/api/java/ConstructorList.java
@@ -24,11 +24,20 @@ public class ConstructorList extends Z3Object
 {
     /**
      * Destructor.
+     * @throws Throwable 
      * @throws Z3Exception on error
      **/
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
-        Native.delConstructorList(getContext().nCtx(), getNativeObject());
+        try {        
+            Native.delConstructorList(getContext().nCtx(), getNativeObject());            
+        }
+        catch (Throwable t) {
+            throw t;
+        }
+        finally {
+            super.finalize();
+        }
     }
 
     ConstructorList(Context ctx, long obj)
diff --git a/src/api/java/Context.java b/src/api/java/Context.java
index 0955f79ca..8b7157181 100644
--- a/src/api/java/Context.java
+++ b/src/api/java/Context.java
@@ -18,6 +18,7 @@ Notes:
 package com.microsoft.z3;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import com.microsoft.z3.enumerations.Z3_ast_print_mode;
 
@@ -3761,29 +3762,35 @@ public class Context extends IDisposable
         return m_Optimize_DRQ;
     }
 
-    protected long m_refCount = 0;
+    protected AtomicInteger m_refCount = new AtomicInteger(0);
 
     /**
      * Finalizer.
+     * @throws Throwable 
      **/
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
-        dispose();
-
-        if (m_refCount == 0)
-        {
-            try
+        try {            
+            dispose();
+    
+            if (m_refCount.get() == 0)
             {
-                Native.delContext(m_ctx);
-            } catch (Z3Exception e)
-            {
-                // OK.
-            }
-            m_ctx = 0;
-        } 
-        /*
-        else
-            CMW: re-queue the finalizer? */
+                try
+                {
+                    Native.delContext(m_ctx);
+                } catch (Z3Exception e)
+                {
+                    // OK.
+                }
+                m_ctx = 0;
+            } 
+        }
+        catch (Throwable t) {
+            throw t;
+        }
+        finally {
+            super.finalize();
+        }
     }
 
     /**
diff --git a/src/api/java/Z3Object.java b/src/api/java/Z3Object.java
index 877e22cac..473cb5403 100644
--- a/src/api/java/Z3Object.java
+++ b/src/api/java/Z3Object.java
@@ -25,10 +25,19 @@ public class Z3Object extends IDisposable
 {
     /**
      * Finalizer.
+     * @throws Throwable 
      **/
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
-        dispose();
+        try {
+            dispose();            
+        }
+        catch (Throwable t) {
+            throw t;
+        }
+        finally {
+            super.finalize();
+        }
     }
 
     /**
@@ -43,8 +52,8 @@ public class Z3Object extends IDisposable
         }
 
         if (m_ctx != null)
-        {
-            m_ctx.m_refCount--;
+        {            
+            m_ctx.m_refCount.decrementAndGet();
             m_ctx = null;
         }
     }
@@ -54,13 +63,13 @@ public class Z3Object extends IDisposable
 
     Z3Object(Context ctx)
     {
-        ctx.m_refCount++;
+        ctx.m_refCount.incrementAndGet();
         m_ctx = ctx;
     }
 
     Z3Object(Context ctx, long obj)
     {
-        ctx.m_refCount++;
+        ctx.m_refCount.incrementAndGet();
         m_ctx = ctx;
         incRef(obj);
         m_n_obj = obj;