Added Scenario Error Handling