New: Only include scenario in error messages when using multiple scenarios.

This will make messages more reable.