Change Scripts as to allow better error handling
Merge pull request #3544 from Martin-Grunewald/Scripts

HLT -- Change Scripts as to allow better error handling