Added in JavaInterrogator fix for null pointer exception.