@@ -555,4 +555,24 @@ public void testUserDefinedVoidMethod() throws InterpreterException {
      Object result = interpret("public void foo() {}; foo()");
      assertSame("Should have returned NO_RESULT.", null, result);
    }
+  
+  /** Test throwing null, for bug 3008828. */
+  public void testThrowNull() throws InterpreterException {
+    try {
+      _interpreter.interpret("throw null");
+      fail("Should have thrown an EvaluatorException with a NullPointerException as cause.");
+    }
+    catch(Throwable t) {
+      if ((t == null) || (!(t instanceof EvaluatorException))) {
+        fail("Should have thrown an EvaluatorException with a NullPointerException as cause.");
+      }
+      else {
+        Throwable cause = t.getCause();
+        if (!(cause instanceof NullPointerException)) {
+          fail("Should have thrown an EvaluatorException with a NullPointerException as cause.");
+        }
+      }
+    }
+  }
+
 }
@@ -305,6 +305,15 @@ public Object next() {
 
   @Override public Result visit(ThrowStatement node) {
     Throwable t = (Throwable) new ExpressionEvaluator(_bindings, _opt).value(node.getExpression());
+    // bug fix for DrJava bug 3008828
+    if (t == null) {
+        // as per Java Language Specification (JLS):
+        // http://java.sun.com/docs/books/jls/third_edition/html/statements.html#14.18
+        // "If evaluation of the Expression completes normally, producing a null value,
+        // then an instance VÕ of class NullPointerException is created and thrown instead of null." 
+        t = new NullPointerException();
+        t.setStackTrace(new StackTraceElement[0]);
+    }
     throw new WrappedException(new EvaluatorException(t));
   }