Friendlier error messages for /fr
Merge pull request #974 from Slayer95/master

Friendlier error messages for /fr