Revert "Give the right exception when there is an invalid user"

This reverts commit 4d3e2a416ccbc360cceb57b7a8344ef1d123c261.
Merge branch 'development'