diff --git a/solar/solar/errors.py b/solar/solar/errors.py
index e12feb4e..2b7b6443 100644
--- a/solar/solar/errors.py
+++ b/solar/solar/errors.py
@@ -35,3 +35,7 @@ class LexError(SolarError):
 
 class ParseError(SolarError):
     pass
+
+
+class ExecutionTimeout(SolarError):
+    pass
diff --git a/solar/solar/orchestration/graph.py b/solar/solar/orchestration/graph.py
index ed37592e..8370e289 100644
--- a/solar/solar/orchestration/graph.py
+++ b/solar/solar/orchestration/graph.py
@@ -19,6 +19,7 @@ import networkx as nx
 
 from solar import utils
 from .traversal import states
+from solar import errors
 
 from collections import Counter
 
@@ -178,4 +179,4 @@ def wait_finish(uid, timeout):
             return
     else:
         raise errors.ExecutionTimeout(
-            'Next tasks wasnt able to finish: %s' % not_finished)
+            'Run %s wasnt able to finish' % uid)