diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9be7e4ac6cc..f8c4f5d6f6e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-09  Gary Benson  <gbenson@redhat.com>
+
+	* stacktrace.cc (accesscontrol_trace_fn): Skip non-Java frames.
+
 2006-08-09  Gary Benson  <gbenson@redhat.com>
 
 	* java/lang/System.java (setSecurityManager): Javadoc fix.
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index e81294ddf69..bd011d005ce 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -542,12 +542,14 @@ _Jv_StackTrace::accesscontrol_trace_fn (_Jv_UnwindState *state)
   _Jv_StackFrame *frame = &state->frames[state->pos];
   FillInFrameInfo (frame);
 
+  if (!(frame->klass && frame->meth))
+    return _URC_NO_REASON;
+
   bool *stopping = (bool *) state->trace_data;
   if (*stopping)
     return _URC_NORMAL_STOP;
   
   if (frame->klass == &::java::security::AccessController::class$
-      && frame->meth
       && strcmp (frame->meth->name->chars(), "doPrivileged") == 0)
     *stopping = true;