diff --git a/profile.d/pwd.sh b/profile.d/pwd.sh
index b51133a..d9fed47 100755
--- a/profile.d/pwd.sh
+++ b/profile.d/pwd.sh
@@ -133,6 +133,13 @@ genpwd()
 		(( rlength++ ))
 	    fi
 
+	    # Check if we have enough car to have something viable
+	    if [[ ${#carset} -lt $length ]]; then
+		echo 'Error: not enought caracters are authorised for the password length.'
+		echo 'Please allow more caracter (preferably) or reduce password lentgh.'
+		return 1
+	    fi
+
 	    for i in $( seq 1 $(( $length - $rlength )) ); do
 		pickcar "$carset"
 	    done
diff --git a/profile.sh b/profile.sh
index 3d6a57b..8bdbf71 100644
--- a/profile.sh
+++ b/profile.sh
@@ -35,6 +35,7 @@
 # 27/08/2022 v3.0.0 : splitted everything, added rain screensaver
 # 07/11/2022 v3.0.1 : added concatenation to rmspc, added ku, error managed in meteo
 # 08/11/2022 v3.1.0 : added password generator
+# 10/11/2022 v3.1.1 : genpwd: test if password is doable
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -70,7 +71,7 @@
 # * OF SUCH DAMAGE.
 # ------------------------------------------------------------------------------
 
-export PROFVERSION="3.1.0"
+export PROFVERSION="3.1.1"
 
 export DEFAULT_CITY="Toulouse"