diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7375a7a..1bb850b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Version 2.10.1
+
+### Features
+
+- [#80](https://github.com/Orange-OpenSource/floss-toolbox/issues/80) Diver - Path variables not protected
+
 ## Version 2.10.0
 
 ### Features
diff --git a/toolbox/diver/extract-emails-from-history.sh b/toolbox/diver/extract-emails-from-history.sh
index 9acedcf..7b5ea4e 100644
--- a/toolbox/diver/extract-emails-from-history.sh
+++ b/toolbox/diver/extract-emails-from-history.sh
@@ -210,7 +210,7 @@ current_folder=`pwd`
 cd "$git_based_project"
 
 git_log_file="$current_folder/data/$GIT_LOG_TEMP_FILE"
-if [ -f $git_log_file ]; then
+if [ -f "$git_log_file" ]; then
     rm $git_log_file
 fi
 
@@ -222,7 +222,7 @@ if [ "$( git log --oneline -5 2>/dev/null | wc -l )" -eq 0 ]; then
     NormalExit
 fi
 
-git log --since=$git_log_limit > $git_log_file
+git log --since=$git_log_limit > "$git_log_file"
 
 if [ ! -s "$git_log_file" ]; then
     cd "$current_folder"
@@ -276,7 +276,7 @@ echo "📈 Elapsed time.............................................: $(($script
 
 # The end!
 
-rm $git_log_file
+rm "$git_log_file"
 echo -e "\nReports available in $REPORT_METRIC_FILE:"
 cat $REPORT_METRIC_FILE