Improved a couple error messages.