--- a/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorExit.java	Wed Apr 27 20:27:43 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorExit.java	Wed Apr 27 20:58:01 2011 +0200
@@ -42,16 +42,11 @@
      */
     public MonitorExit(Value object, Value lockAddress, int lockNumber, FrameState stateBefore) {
         super(object, lockAddress, stateBefore, lockNumber);
-        if (object.isNonNull()) {
-            eliminateNullCheck();
-        }
     }
 
     @Override
     public boolean canTrap() {
-        // C1X assumes that locks are well balanced and so there no need to handle
-        // IllegalMonitorStateExceptions thrown by monitorexit instructions.
-        return needsNullCheck();
+        return true;
     }
 
     @Override