diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index 290d48b0..9e8ab16c 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -1032,10 +1032,13 @@ namespace WebSocketSharp.Server
     /// Adds a WebSocket service with the specified behavior,
     /// <paramref name="path"/>, and <paramref name="creator"/>.
     /// </summary>
+    /// <remarks>
+    /// <paramref name="path"/> is converted to a URL-decoded string and
+    /// / is trimmed from the end of the converted string if any.
+    /// </remarks>
     /// <param name="path">
     /// A <see cref="string"/> that represents an absolute path to
-    /// the service. It will be converted to a URL-decoded string,
-    /// and will be removed <c>'/'</c> from tail end if any.
+    /// the service to add.
     /// </param>
     /// <param name="creator">
     /// A <c>Func&lt;TBehavior&gt;</c> delegate that invokes
@@ -1047,6 +1050,41 @@ namespace WebSocketSharp.Server
     /// The type of the behavior for the service. It must inherit
     /// the <see cref="WebSocketBehavior"/> class.
     /// </typeparam>
+    /// <exception cref="ArgumentNullException">
+    ///   <para>
+    ///   <paramref name="path"/> is <see langword="null"/>.
+    ///   </para>
+    ///   <para>
+    ///   -or-
+    ///   </para>
+    ///   <para>
+    ///   <paramref name="creator"/> is <see langword="null"/>.
+    ///   </para>
+    /// </exception>
+    /// <exception cref="ArgumentException">
+    ///   <para>
+    ///   <paramref name="path"/> is empty.
+    ///   </para>
+    ///   <para>
+    ///   -or-
+    ///   </para>
+    ///   <para>
+    ///   <paramref name="path"/> is not an absolute path.
+    ///   </para>
+    ///   <para>
+    ///   -or-
+    ///   </para>
+    ///   <para>
+    ///   <paramref name="path"/> includes either or both
+    ///   query and fragment components.
+    ///   </para>
+    ///   <para>
+    ///   -or-
+    ///   </para>
+    ///   <para>
+    ///   <paramref name="path"/> is already in use.
+    ///   </para>
+    /// </exception>
     public void AddWebSocketService<TBehavior> (
       string path, Func<TBehavior> creator
     )