diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index ce411a69a..5e03d8b6a 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -362,6 +362,7 @@ public final class Diagnostics {
         } catch (SecurityException  e) {
             ignoreThrowable(e);
             out.println("Access to System.getProperties() blocked " + "by a security manager");
+            return;
         }
         for (Enumeration keys = sysprops.propertyNames();
             keys.hasMoreElements();) {
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index dd0e123af..1c8e39399 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -1643,7 +1643,7 @@ public final class IntrospectionHelper {
     }
 
 
-    private class MethodAndObject {
+    private static class MethodAndObject {
         private Method method;
         private Object object;
         public MethodAndObject(Method method, Object object) {