Begin to add more intelligent error messages