Add error handling for top-level scenario parameters