Better exception manage when put