diff --git a/Service/Sources/EDOServicePort.m b/Service/Sources/EDOServicePort.m
index b4ceee1..f56e7ed 100644
--- a/Service/Sources/EDOServicePort.m
+++ b/Service/Sources/EDOServicePort.m
@@ -87,6 +87,9 @@ - (void)encodeWithCoder:(NSCoder *)aCoder {
 }
 
 - (BOOL)match:(EDOServicePort *)otherPort {
+  if (!otherPort) {
+    return NO;
+  }
   // Ignore deviceSerial since it is not saved in the host side.
   BOOL isNameEqual = self.hostPort.name == otherPort.hostPort.name ||
                      [self.hostPort.name isEqualToString:otherPort.hostPort.name];