Added error messages and increased character count