Keenan - Updated contact us error handling