diff --git a/wa/__init__.py b/wa/__init__.py
index 5b25be90..1357114e 100644
--- a/wa/__init__.py
+++ b/wa/__init__.py
@@ -2,12 +2,11 @@ from wa.framework import pluginloader, signal
 from wa.framework.command import Command, ComplexCommand, SubCommand
 from wa.framework.configuration import settings
 from wa.framework.configuration.core import Status
-from wa.framework.exception import HostError, JobError, InstrumentError, ConfigError
-from wa.framework.exception import (OutputProcessorError, ResourceError,
-                                    CommandError, ToolError)
-from wa.framework.exception import (WAError, NotFoundError, ValidationError,
-                                    WorkloadError)
-from wa.framework.exception import WorkerThreadError, PluginLoaderError
+from wa.framework.exception import (CommandError, ConfigError, HostError, InstrumentError,
+                                    JobError, NotFoundError, OutputProcessorError,
+                                    PluginLoaderError, ResourceError, TargetError,
+                                    TargetNotRespondingError, TimeoutError, ToolError,
+                                    ValidationError, WAError, WorkloadError, WorkerThreadError)
 from wa.framework.instrument import (Instrument, very_slow, slow, normal, fast,
                                      very_fast)
 from wa.framework.output import RunOutput, discover_wa_outputs