Improve error message
Update for site error