From 9a98961e2174942a66bfbd8b2cbe228d16503b5c Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Thu, 12 Nov 2015 22:45:17 +0100
Subject: [PATCH] Clarified exception handling.

---
 .../main/java/com/jayway/jsonpath/JsonPath.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
index bb35ab18..f1f88f91 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
@@ -195,15 +195,16 @@ public class JsonPath {
         } catch (RuntimeException e){
             if(!optSuppressExceptions){
                 throw e;
-            }
-        }
-        if(optAsPathList){
-            return (T)configuration.jsonProvider().createArray();
-        } else {
-            if(optAlwaysReturnList){
-                return (T)configuration.jsonProvider().createArray();
             } else {
-                return (T)(path.isDefinite() ? null : configuration.jsonProvider().createArray());
+                if(optAsPathList){
+                    return (T)configuration.jsonProvider().createArray();
+                } else {
+                    if(optAlwaysReturnList){
+                        return (T)configuration.jsonProvider().createArray();
+                    } else {
+                        return (T)(path.isDefinite() ? null : configuration.jsonProvider().createArray());
+                    }
+                }
             }
         }
     }