Add more informative error messages & cap username