diff --git a/src/server/conn.py b/src/server/conn.py
index bf2d8a3..9e0c6d4 100644
--- a/src/server/conn.py
+++ b/src/server/conn.py
@@ -450,7 +450,7 @@ class ConnectionInterfaceRequests(
         target_id = props.get(CHANNEL_INTERFACE + '.TargetID', None)
 
         # Handle type 0 cannot have a handle.
-        if target_handle_type == HANDLE_TYPE_NONE and target_handle != None:
+        if target_handle_type == HANDLE_TYPE_NONE and target_handle != 0 and target_handle != None:
             raise InvalidArgument('When TargetHandleType is NONE, ' +
                 'TargetHandle must be omitted')