diff --git a/tcp_tests/utils/get_jenkins_job_stages.py b/tcp_tests/utils/get_jenkins_job_stages.py
index 361b8d1..883494f 100755
--- a/tcp_tests/utils/get_jenkins_job_stages.py
+++ b/tcp_tests/utils/get_jenkins_job_stages.py
@@ -111,16 +111,12 @@
     for _ in range(3):
         wf = jenkins.get_workflow(opts.job_name, opts.build_number)
         info = jenkins.build_info(opts.job_name, int(wf['id']))
-        if info is not None:
+        if info.get('result'):
             break
         time.sleep(3)
 
-    if not info:
-        raise("Cannot get info for the job {0}:{1}".format(opts.job_name,
-                                                           opts.build_number))
-
     build_description = ("[" + info['fullDisplayName'] + "] " +
-                         info['url'] + " : " + info['result'])
+                         info['url'] + " : " + (info['result'] or 'No result'))
     stages = get_stages(wf['stages'], 0)
     if not stages:
         msg = wf['status'] + ":\n\n"
diff --git a/tcp_tests/utils/run_jenkins_job.py b/tcp_tests/utils/run_jenkins_job.py
index 00ebec6..b01f366 100755
--- a/tcp_tests/utils/run_jenkins_job.py
+++ b/tcp_tests/utils/run_jenkins_job.py
@@ -4,6 +4,7 @@
 import os
 import sys
 
+from devops import error
 import json
 
 sys.path.append(os.getcwd())
@@ -131,13 +132,18 @@
     if opts.verbose:
         print_build_header(build, job_params, opts)
 
-    jenkins.wait_end_of_build(
-        name=build[0],
-        build_id=build[1],
-        timeout=opts.build_timeout,
-        interval=1,
-        verbose=opts.verbose,
-        job_output_prefix=opts.job_output_prefix)
+    try:
+        jenkins.wait_end_of_build(
+            name=build[0],
+            build_id=build[1],
+            timeout=opts.build_timeout,
+            interval=1,
+            verbose=opts.verbose,
+            job_output_prefix=opts.job_output_prefix)
+    except error.TimeoutError as e:
+        print(str(e))
+        raise
+
     result = jenkins.build_info(name=build[0],
                                 build_id=build[1])['result']
     if opts.verbose: