From 6bd0e8cc60389c9298064bbba25cdf63597713e4 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Wed, 20 Nov 2019 14:15:30 +0100
Subject: [PATCH] Added NPE guard

---
 .../contract/wiremock/restdocs/ContractExchangeHandler.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java
index 6447428b53..ddf02f27a0 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +92,9 @@ public class ContractExchangeHandler
 		@SuppressWarnings("unchecked")
 		Map<String, Object> map = (((Map<String, Map<String, Object>>) ReflectionUtils
 				.getField(field, null)).get(index));
+		if (map == null) {
+			return new HashMap<>();
+		}
 		return map;
 	}