Added some more helpful error messages.