added new error messages
added new keys