From 1adc7340d150e25e67f7fe7957d33a2238280552 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Sun, 5 Feb 2017 11:49:04 +0100
Subject: [PATCH] .

---
 src/WireMock.Net/Server/FluentMockServer.Admin.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/WireMock.Net/Server/FluentMockServer.Admin.cs b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
index 28497ee3..0f36c009 100644
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using SimMetrics.Net;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
@@ -390,7 +389,10 @@ namespace WireMock.Server
 
         private MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
         {
-            return matchers?.Select(Map).Where(x => x != null).ToArray();
+            if (matchers == null || !matchers.Any())
+                return null;
+
+            return matchers.Select(Map).Where(x => x != null).ToArray();
         }
 
         private MatcherModel Map([CanBeNull] IMatcher matcher)
@@ -407,7 +409,10 @@ namespace WireMock.Server
 
         private string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
         {
-            return funcs?.Select(Map).Where(x => x != null).ToArray();
+            if (funcs == null || !funcs.Any())
+                return null;
+
+            return funcs.Select(Map).Where(x => x != null).ToArray();
         }
 
         private string Map<T>([CanBeNull] Func<T, bool> func)