diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 5b776dd6..3b179d3e 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -25,9 +25,11 @@ A new interactive terminal interface built with [Textual](https://textual.textua
 
 Launch with:
 ```bash
-experimaestro experiments monitor --console --workdir /path/to/workdir
+experimaestro experiments --workdir /path/to/workdir monitor --console 
 ```
 
+with workdir one of the directories defined in the [Settings](settings.md)
+
 #### [Resumable Tasks](experiments/task.md#resumable-tasks)
 
 Tasks can now handle timeouts gracefully and resume from where they left off:
diff --git a/docs/source/experiments.md b/docs/source/experiments.md
index c62cffde..9d028fb2 100644
--- a/docs/source/experiments.md
+++ b/docs/source/experiments.md
@@ -275,9 +275,11 @@ To view the hostname for experiments:
 
 ```bash
 # CLI - shows hostname in brackets
-experimaestro experiments list --workdir /path/to/workspace
+experimaestro experiments --workdir /path/to/workdir list
 # Output: my-experiment [hostname.local] (5/10 jobs)
 
 # TUI - hostname shown in "Host" column
-experimaestro experiments monitor --console --workdir /path/to/workspace
+experimaestro experiments --workdir /path/to/workdir monitor --console 
 ```
+
+with workdir one of the directories defined in the [Settings](settings.md)
\ No newline at end of file
diff --git a/docs/source/settings.md b/docs/source/settings.md
index dee30319..89cf58ee 100644
--- a/docs/source/settings.md
+++ b/docs/source/settings.md
@@ -1,4 +1,6 @@
-# Configuration
+# Experimaestro configuration
+
+This pages describes how experimaestro itself can be configured for your need.
 
 ## Settings file
 
diff --git a/src/experimaestro/core/arguments.py b/src/experimaestro/core/arguments.py
index ac67f4f8..b063f345 100644
--- a/src/experimaestro/core/arguments.py
+++ b/src/experimaestro/core/arguments.py
@@ -133,7 +133,10 @@ def __repr__(self):
         return "Param[{name}:{type}]".format(**self.__dict__)
 
     def validate(self, value):
-        value = self.type.validate(value)
+        try:
+            value = self.type.validate(value)
+        except TypeError as e:
+            raise TypeError(f"Value {value} is not valid for argument {self.name}: {e}")
         if self.checker:
             if not self.checker.check(value):
                 raise ValueError("Value %s is not valid", value)