Merge "Refactor error checking on script/control side."