Additional keep stack trace extension method calls

Author: Mpdreamz

src/Nest/ElasticClient-Search.cs

@@ -75,8 +75,11 @@ public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(Func<SearchDescrip
 
 			return this.RawDispatch.SearchDispatchAsync<SearchResponse<TResult>>(pathInfo, descriptor)
 				.ContinueWith<ISearchResponse<TResult>>(t => {
-					if (t.IsFaulted)
-						throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 
 					return t.Result.Success
 						? t.Result.Response
@@ -101,8 +104,11 @@ public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(ISearchRequest req
 
 			return this.RawDispatch.SearchDispatchAsync<SearchResponse<TResult>>(pathInfo, request)
 				.ContinueWith<ISearchResponse<TResult>>(t => {
-					if (t.IsFaulted)
-						throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 
 					return t.Result.Success
 						? t.Result.Response

src/Nest/ElasticClient-SearchTemplate.cs

@@ -69,8 +69,11 @@ public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(Func<Searc
 			return this.RawDispatch.SearchTemplateDispatchAsync<SearchResponse<TResult>>(pathInfo, descriptor)
 				.ContinueWith<ISearchResponse<TResult>>(t =>
 				{
-					if (t.IsFaulted)
-						throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 
 					return t.Result.Success
 						? t.Result.Response
@@ -94,8 +97,11 @@ public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTem
 			return this.RawDispatch.SearchTemplateDispatchAsync<SearchResponse<TResult>>(pathInfo, request)
 				.ContinueWith<ISearchResponse<TResult>>(t =>
 				{
-					if (t.IsFaulted)
-						throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 
 					return t.Result.Success
 						? t.Result.Response