diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
index 29222ceff..257177577 100644
--- a/core/src/processing/core/PGraphicsJava2D.java
+++ b/core/src/processing/core/PGraphicsJava2D.java
@@ -154,7 +154,7 @@ public class PGraphicsJava2D extends PGraphics {
     // hm, mark pixels as changed, because this will instantly do a full
     // copy of all the pixels to the surface.. so that's kind of a mess.
     //updatePixels();
-    
+
     insideDraw = false;
   }
 
@@ -230,7 +230,7 @@ public class PGraphicsJava2D extends PGraphics {
       }
       break;
 */
-      
+
     case TRIANGLES:
       if ((vertexCount % 3) == 0) {
         triangle(vertices[vertexCount - 3][MX],
@@ -805,6 +805,10 @@ public class PGraphicsJava2D extends PGraphics {
 
     Object antialias =
       g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+    if (antialias == null) {
+      // if smooth() and noSmooth() not called, this will be null (0120)
+      antialias = RenderingHints.VALUE_ANTIALIAS_DEFAULT;
+    }
 
     // override the current smoothing setting based on the font
     // also changes global setting for antialiasing, but this is because it's
diff --git a/core/todo.txt b/core/todo.txt
index 30bb18ea5..3d5b46d12 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,4 +1,7 @@
 0120 core
+X fixed error when using hint(ENABLE_NATIVE_FONTS) with JAVA2D
+X   java.lang.IllegalArgumentException: 
+X   null incompatible with Global antialiasing enable key
 
 _ loadBytes() and saveStream() functions badly need optimization!
 _   don't bother using a buffering stream, just handle internally. gah!