Merge "Scenario manager: catch Exception in get_remote_client"