Error handing
Merge branch 'master' into sitesearch