@@ -0,0 +1,44 @@
+"""
+This example:
+
+1. Connects to the current model
+2. Deploy a bundle and waits until it reports itself active
+3. Destroys the units and applications
+
+"""
+import asyncio
+
+from juju import loop
+from juju.model import Model
+
+
+async def main():
+    model = Model()
+    print('Connecting to model')
+    # connect to current model with current user, per Juju CLI
+    await model.connect()
+
+    try:
+        print('Deploying bundle')
+        applications = await model.deploy(
+            'cs:~juju-qa/bundle/basic-0',
+            series='xenial',
+            channel='beta',
+        )
+
+        print('Waiting for active')
+        await model.block_until(
+            lambda: all(unit.workload_status == 'active'
+                        for application in applications
+                            for unit in application.units))
+
+        print('Removing bundle')
+        for application in applications:
+            await application.remove()
+    finally:
+        print('Disconnecting from model')
+        await model.disconnect()
+
+
+if __name__ == '__main__':
+    loop.run(main())
@@ -3,7 +3,7 @@
 
 1. Connects to the current model
 2. Deploy a bundle with trust and waits until it reports itself active
-3. Destroys the unit and application
+3. Destroys the units and applications
 
 """
 from juju import loop
@@ -19,12 +19,11 @@ async def main():
     try:
         print('Deploying trusted bundle')
         applications = await model.deploy(
-            'cs:~juju-qa/bundle/aws-integrator-trust-single-1',
-            series='xenial',
+            'cs:~juju-qa/bundle/basic-trusted-1',
+            series='bionic',
             channel='beta',
             trust=True,
         )
-        print("apps {}".format(applications))
 
         print('Waiting for active')
         await model.block_until(
@@ -33,7 +32,8 @@ async def main():
                             for unit in application.units))
 
         print('Removing bundle')
-        await (application.remove() for application in applications)
+        for application in applications:
+            await application.remove()
     finally:
         print('Disconnecting from model')
         await model.disconnect()
 
@@ -1924,6 +1924,22 @@ def __init__(self, model, trusted=False, forced=False):
         self.ann_facade = client.AnnotationsFacade.from_connection(
             model.connection())
 
+    async def _validate_bundle(self, bundle):
+        """Validate the bundle for known issues, raises an error if it
+        encounters a known problem
+        """
+        apps_dict = bundle.get('applications', bundle.get('services', {}))
+        for app_name in self.applications:
+            app_dict = apps_dict[app_name]
+            app_trusted = app_dict.get('trust')
+            if (not self.trusted and not self.forced) and app_trusted:
+                raise JujuError(
+                    "Bundle cannot be deployed without trusting applications with your cloud credentials.\n"
+                    "Please repeat the deploy command with the --trust argument if you consent to trust the following application\n"
+                    " - {}\n".format(app_name)
+                )
+        return bundle
+
     async def _handle_local_charms(self, bundle):
         """Search for references to local charms (i.e. filesystem paths)
         in the bundle. Upload the local charms to the model, and replace
@@ -1953,14 +1969,6 @@ async def _handle_local_charms(self, bundle):
                 raise JujuError(
                     "Couldn't determine series for charm at {}. "
                     "Add a 'series' key to the bundle.".format(charm_dir))
-
-            app_trusted = app_dict.get('trust')
-            if (not self.trusted and not self.forced) and app_trusted:
-                raise JujuError(
-                    "Bundle cannot be deployed without trusting applications with your cloud credentials. "
-                    "Please repeat the deploy command with the --trust argument if you consent to trust the following application"
-                    " - {}".format(app_name)
-                )
             # Keep track of what we need to update. We keep a list of apps
             # that need to be updated, and a corresponding list of args
             # needed to update those apps.
@@ -1992,6 +2000,7 @@ async def fetch_plan(self, entity_id):
                                                       filename='bundle.yaml',
                                                       read_file=True)
         self.bundle = yaml.safe_load(bundle_yaml)
+        self.bundle = await self._validate_bundle(self.bundle)
         self.bundle = await self._handle_local_charms(self.bundle)
 
         self.plan = await self.bundle_facade.GetChanges(
 
@@ -1,24 +1,22 @@
 import asyncio
-import mock
+import os
+import time
+import uuid
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
-import paramiko
 
-from juju.client.client import ConfigValue, ApplicationFacade
-from juju.model import Model, ModelObserver
-from juju.utils import block_until, run_with_interrupt
-from juju.errors import JujuError
+import mock
+import paramiko
 
-import os
 import pylxd
-import time
-import uuid
-
 import pytest
+from juju.client.client import ApplicationFacade, ConfigValue
+from juju.errors import JujuError
+from juju.model import Model, ModelObserver
+from juju.utils import block_until, run_with_interrupt
 
 from .. import base
 
-
 MB = 1
 GB = 1024
 SSH_KEY = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsYMJGNGG74HAJha3n2CFmWYsOOaORnJK6VqNy86pj0MIpvRXBzFzVy09uPQ66GOQhTEoJHEqE77VMui7+62AcMXT+GG7cFHcnU8XVQsGM6UirCcNyWNysfiEMoAdZScJf/GvoY87tMEszhZIUV37z8PUBx6twIqMdr31W1J0IaPa+sV6FEDadeLaNTvancDcHK1zuKsL39jzAg7+LYjKJfEfrsQP+lj/EQcjtKqlhVS5kzsJVfx8ZEd0xhW5G7N6bCdKNalS8mKCMaBXJpijNQ82AiyqCIDCRrre2To0/i7pTjRiL0U9f9mV3S4NJaQaokR050w/ZLySFf6F7joJT mathijs@Qrama-Mathijs'  # noqa
@@ -93,6 +91,16 @@ async def test_deploy_bundle(event_loop):
             assert app in model.applications
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_deploy_trusted_bundle(event_loop):
+    async with base.CleanModel() as model:
+        await model.deploy('cs:~juju-qa/bundle/basic-trusted-1', trust=True)
+
+        for app in ('ubuntu', 'ubuntu-lite'):
+            assert app in model.applications
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_channels_revs(event_loop):