--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Fri Sep 06 17:10:02 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Sun Sep 08 11:54:21 2013 +0100
@@ -3829,30 +3829,32 @@
 
     @Override
     public void visitTry(JCTry tree) {
-        if (tree.resources.isEmpty()) {
-            /* special case of try without catchers and with finally emtpy.
-             * Don't give it a try, translate only the body.
-             */
-            if (tree.catchers.isEmpty() &&
-                tree.finalizer.getStatements().isEmpty()) {
-                result = translate(tree.body);
+        if (tree.resources.nonEmpty()) {
+            result = makeTwrTry(tree);
+            return;
+        }
+
+        boolean hasBody = tree.body.getStatements().nonEmpty();
+        boolean hasCatchers = tree.catchers.nonEmpty();
+        boolean hasFinally = tree.finalizer != null &&
+                tree.finalizer.getStatements().nonEmpty();
+
+        if (!hasCatchers && !hasFinally) {
+            result = translate(tree.body);
+            return;
+        }
+
+        if (!hasBody) {
+            if (hasFinally) {
+                result = translate(tree.finalizer);
             } else {
-                /* also if the body is empty we only need to generate the finalizer
-                 * provided that it's not empty.
-                 */
-                if (tree.body.getStatements().isEmpty()) {
-                    if (tree.finalizer.getStatements().isEmpty()) {
-                        result = translate(tree.body);
-                    } else {
-                        result = translate(tree.finalizer);
-                    }
-                } else {
-                    super.visitTry(tree);
-                }
+                result = translate(tree.body);
             }
-        } else {
-            result = makeTwrTry(tree);
+            return;
         }
+
+        // no optimizations possible
+        super.visitTry(tree);
     }
 
 /**************************************************************************

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/T8024398/NPETryTest.java	Sun Sep 08 11:54:21 2013 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8024398
+ * @summary javac, compiler crashes with try with empty body
+ * @compile NPETryTest.java
+ */
+
+public class NPETryTest {
+    void m()
+    {
+        /* This is the statement provoking the error the rest are provided as
+         * additional tests
+         */
+        try {}
+        catch (Exception e) {}
+
+        try {}
+        catch (Exception e) {}
+        finally {}
+
+        try {}
+        finally {}
+    }
+}