diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar
index 27e9a3d..ac3c3dc 100644
Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ
diff --git a/org.intrace/src/org/intrace/output/trace/TraceHandler.java b/org.intrace/src/org/intrace/output/trace/TraceHandler.java
index c79d207..dcd8e57 100644
--- a/org.intrace/src/org/intrace/output/trace/TraceHandler.java
+++ b/org.intrace/src/org/intrace/output/trace/TraceHandler.java
@@ -305,7 +305,7 @@ public class TraceHandler implements IInstrumentationHandler
     if (argTrace)
     {
       String objStr;
-      if (objArg.getClass().isArray())
+      if ((objArg != null) && objArg.getClass().isArray())
       {
         // Array return values pass through this arm so we must do something
         // a bit special - use Arrays.deepToString and discard the surrounding