Change scripts to include error msgs