diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dc120cabc49d..5bcf24eb1cab 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-09  Kyle Galloway  <kgallowa@redhat.com>
+
+	* interpret-run.cc: If debugging, check if args is NULL before
+	getting the "this" pointer.
+
 2007-04-09  Kyle Galloway  <kgallowa@redhat.com>
 
 	* classpath/gnu/classpath/jdwp/value/ArrayValue.java: New file.
diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc
index 30e55daec3c0..b8c88af78278 100644
--- a/libjava/interpret-run.cc
+++ b/libjava/interpret-run.cc
@@ -46,9 +46,13 @@ details.  */
   // If the method is non-static, we need to set the type for the "this" pointer.
   if ((method->accflags & java::lang::reflect::Modifier::STATIC) == 0)
     {
-      // Set the "this" pointer for this frame
-      _Jv_word *this_ptr = reinterpret_cast<_Jv_word *> (args);
-      frame_desc.obj_ptr = this_ptr[0].o;
+      if (args)
+        {
+          // Set the "this" pointer for this frame.
+          _Jv_word *this_ptr = reinterpret_cast<_Jv_word *> (args);
+          frame_desc.obj_ptr = this_ptr[0].o;
+        }
+
       frame_desc.locals_type[0] = 'o';
       type_ctr++;
     }