Change Scripts as to allow better error handling

Change Scripts as to allow better error handling