diff --git a/src/uws/service/file/LocalUWSFileManager.java b/src/uws/service/file/LocalUWSFileManager.java
index 4aa9fd681b8c64f743486ff63c20d3619067ec37..633f7519d9c11d2d86165802225171eb81dc8d90 100644
--- a/src/uws/service/file/LocalUWSFileManager.java
+++ b/src/uws/service/file/LocalUWSFileManager.java
@@ -108,7 +108,8 @@ public class LocalUWSFileManager implements UWSFileManager {
 	 * 
 	 * @param root				UWS root directory.
 	 *
-	 * @throws UWSException		If the given root directory is <i>null</i>, is not a directory or has not the READ and WRITE permissions.
+	 * @throws NullPointerException	If the given root directory is <i>null</i>.
+	 * @throws UWSException			If the given file is not a directory or has not the READ and WRITE permissions.
 	 * 
 	 * @see #LocalUWSFileManager(File, boolean, boolean, OwnerGroupIdentifier)
 	 */
@@ -128,7 +129,8 @@ public class LocalUWSFileManager implements UWSFileManager {
 	 * @param groupUserDirectories		<i>true</i> to group user directories, <i>false</i> otherwise.
 	 * 									<i><u>note:</u> this value is ignored if the previous parameter is false.</i>
 	 *
-	 * @throws UWSException				If the given root directory is <i>null</i>, is not a directory or has not the READ and WRITE permissions.
+	 * @throws NullPointerException	If the given root directory is <i>null</i>.
+	 * @throws UWSException			If the given file is not a directory or has not the READ and WRITE permissions.
 	 * 
 	 * @see #LocalUWSFileManager(File, boolean, boolean, OwnerGroupIdentifier)
 	 */
@@ -150,7 +152,8 @@ public class LocalUWSFileManager implements UWSFileManager {
 	 * 											{@link DefaultOwnerGroupIdentifier} will be chosen as default group identifier.</li>
 	 *									</ul></i>
 	 *
-	 * @throws UWSException				If the given root directory is <i>null</i>, is not a directory or has not the READ and WRITE permissions.
+	 * @throws NullPointerException	If the given root directory is <i>null</i>.
+	 * @throws UWSException			If the given file is not a directory or has not the READ and WRITE permissions.
 	 */
 	public LocalUWSFileManager(final File root, final boolean oneDirectoryForEachUser, final boolean groupUserDirectories, final OwnerGroupIdentifier ownerGroupIdentifier) throws UWSException{
 		if (root == null)