Working on improving the error messages