diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj
index 0a47697487..ba3168c942 100644
--- a/Apollo.xcodeproj/project.pbxproj
+++ b/Apollo.xcodeproj/project.pbxproj
@@ -94,6 +94,7 @@
 		9FF90A6F1DDDEB420034C3B6 /* InputValueEncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FF90A6A1DDDEB420034C3B6 /* InputValueEncodingTests.swift */; };
 		9FF90A711DDDEB420034C3B6 /* ReadFieldValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FF90A6B1DDDEB420034C3B6 /* ReadFieldValueTests.swift */; };
 		9FF90A731DDDEB420034C3B6 /* ParseQueryResponseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FF90A6C1DDDEB420034C3B6 /* ParseQueryResponseTests.swift */; };
+		E86D8E05214B32FD0028EFE1 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86D8E03214B32DA0028EFE1 /* JSONTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -331,6 +332,7 @@
 		9FF90A6A1DDDEB420034C3B6 /* InputValueEncodingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputValueEncodingTests.swift; sourceTree = "<group>"; };
 		9FF90A6B1DDDEB420034C3B6 /* ReadFieldValueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReadFieldValueTests.swift; sourceTree = "<group>"; };
 		9FF90A6C1DDDEB420034C3B6 /* ParseQueryResponseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseQueryResponseTests.swift; sourceTree = "<group>"; };
+		E86D8E03214B32DA0028EFE1 /* JSONTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -547,18 +549,19 @@
 		9FC750521D2A532D00458D91 /* ApolloTests */ = {
 			isa = PBXGroup;
 			children = (
-				9FF90A6C1DDDEB420034C3B6 /* ParseQueryResponseTests.swift */,
-				9F295E301E27534800A24949 /* NormalizeQueryResults.swift */,
 				9F438D0B1E6C494C007BDC1A /* BatchedLoadTests.swift */,
-				9FF90A6A1DDDEB420034C3B6 /* InputValueEncodingTests.swift */,
-				9FF90A6B1DDDEB420034C3B6 /* ReadFieldValueTests.swift */,
+				9FC9A9C71E2EFE6E0023C4D5 /* CacheKeyForFieldTests.swift */,
+				9FADC8531E6B86D900C677E6 /* DataLoaderTests.swift */,
 				9F8622F91EC2117C00C38162 /* FragmentConstructionAndConversionTests.swift */,
+				9FC750551D2A532D00458D91 /* Info.plist */,
+				9FF90A6A1DDDEB420034C3B6 /* InputValueEncodingTests.swift */,
+				E86D8E03214B32DA0028EFE1 /* JSONTests.swift */,
 				9F91CF8E1F6C0DB2008DD0BE /* MutatingResultsTests.swift */,
-				9FC9A9C71E2EFE6E0023C4D5 /* CacheKeyForFieldTests.swift */,
+				9F295E301E27534800A24949 /* NormalizeQueryResults.swift */,
+				9FF90A6C1DDDEB420034C3B6 /* ParseQueryResponseTests.swift */,
 				9FE1C6E61E634C8D00C02284 /* PromiseTests.swift */,
+				9FF90A6B1DDDEB420034C3B6 /* ReadFieldValueTests.swift */,
 				9F19D8451EED8D3B00C57247 /* ResultOrPromiseTests.swift */,
-				9FADC8531E6B86D900C677E6 /* DataLoaderTests.swift */,
-				9FC750551D2A532D00458D91 /* Info.plist */,
 			);
 			path = ApolloTests;
 			sourceTree = "<group>";
@@ -1120,6 +1123,7 @@
 				9FF90A6F1DDDEB420034C3B6 /* InputValueEncodingTests.swift in Sources */,
 				9FE1C6E71E634C8D00C02284 /* PromiseTests.swift in Sources */,
 				9FADC8541E6B86D900C677E6 /* DataLoaderTests.swift in Sources */,
+				E86D8E05214B32FD0028EFE1 /* JSONTests.swift in Sources */,
 				9F8622FA1EC2117C00C38162 /* FragmentConstructionAndConversionTests.swift in Sources */,
 				9FF90A711DDDEB420034C3B6 /* ReadFieldValueTests.swift in Sources */,
 				9F295E311E27534800A24949 /* NormalizeQueryResults.swift in Sources */,
diff --git a/Sources/Apollo/JSON.swift b/Sources/Apollo/JSON.swift
index 15684aba9b..ae629edb8d 100644
--- a/Sources/Apollo/JSON.swift
+++ b/Sources/Apollo/JSON.swift
@@ -40,7 +40,7 @@ extension JSONDecodingError: Matchable {
     }
     
     switch (value, pattern) {
-    case (.missingValue, .missingValue), (.nullValue, .nullValue), (.couldNotConvert, .couldNotConvert):
+    case (.missingValue, .missingValue), (.nullValue, .nullValue), (.wrongType, .wrongType),  (.couldNotConvert, .couldNotConvert):
       return true
     default:
       return false
diff --git a/Tests/ApolloTests/JSONTests.swift b/Tests/ApolloTests/JSONTests.swift
new file mode 100644
index 0000000000..e8c5335579
--- /dev/null
+++ b/Tests/ApolloTests/JSONTests.swift
@@ -0,0 +1,41 @@
+import XCTest
+@testable import Apollo
+
+class JSONTests: XCTestCase {
+  func testMissingValueMatchable() {
+    let value = JSONDecodingError.missingValue
+
+    XCTAssertTrue(value ~= JSONDecodingError.missingValue)
+    XCTAssertFalse(value ~= JSONDecodingError.nullValue)
+    XCTAssertFalse(value ~= JSONDecodingError.wrongType)
+    XCTAssertFalse(value ~= JSONDecodingError.couldNotConvert(value: 123, to: Int.self))
+  }
+
+  func testNullValueMatchable() {
+    let value = JSONDecodingError.nullValue
+
+    XCTAssertTrue(value ~= JSONDecodingError.nullValue)
+    XCTAssertFalse(value ~= JSONDecodingError.missingValue)
+    XCTAssertFalse(value ~= JSONDecodingError.wrongType)
+    XCTAssertFalse(value ~= JSONDecodingError.couldNotConvert(value: 123, to: Int.self))
+  }
+
+  func testWrongTypeMatchable() {
+    let value = JSONDecodingError.wrongType
+
+    XCTAssertTrue(value ~= JSONDecodingError.wrongType)
+    XCTAssertFalse(value ~= JSONDecodingError.nullValue)
+    XCTAssertFalse(value ~= JSONDecodingError.missingValue)
+    XCTAssertFalse(value ~= JSONDecodingError.couldNotConvert(value: 123, to: Int.self))
+  }
+
+  func testCouldNotConvertMatchable() {
+    let value = JSONDecodingError.couldNotConvert(value: 123, to: Int.self)
+
+    XCTAssertTrue(value ~= JSONDecodingError.couldNotConvert(value: 123, to: Int.self))
+    XCTAssertTrue(value ~= JSONDecodingError.couldNotConvert(value: "abc", to: String.self))
+    XCTAssertFalse(value ~= JSONDecodingError.wrongType)
+    XCTAssertFalse(value ~= JSONDecodingError.nullValue)
+    XCTAssertFalse(value ~= JSONDecodingError.missingValue)
+  }
+}