Better error messages and var names