add temporary catch-all server error message
Merge branch 'master' into kettle-deployment