Added error messages,