Some CATCH/CONTROL JVM fixes, after $_ changes.