From e879a09b5a284338fd1f280f6b5c97c123c43b96 Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Wed, 11 Jun 2014 08:52:31 +0200
Subject: [PATCH] Improved error message and exceptions when model is null.

---
 .../jayway/jsonpath/internal/spi/compiler/ArrayPathToken.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/ArrayPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/ArrayPathToken.java
index 2db5f85a..8c85c72d 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/ArrayPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/ArrayPathToken.java
@@ -38,6 +38,9 @@ class ArrayPathToken extends PathToken {
 
     @Override
     void evaluate(String currentPath, Object model, EvaluationContextImpl ctx) {
+        if(model == null){
+            throw new PathNotFoundException("The path " + currentPath + " is null");
+        }
         if (!ctx.jsonProvider().isArray(model)) {
             throw new InvalidPathException(format("Filter: %s can only be applied to arrays. Current context is: %s", toString(), model));
         }