diff --git a/src/tashi/client/tashi-client.py b/src/tashi/client/tashi-client.py
index 85920f7..5171b83 100755
--- a/src/tashi/client/tashi-client.py
+++ b/src/tashi/client/tashi-client.py
@@ -640,6 +640,9 @@
 				fargs = []
 
 			res = f(*fargs)
+			if (type(res) is Exception) or \
+			  (type(res) is TashiException):
+				raise res
 
 		except TashiException, e:
 			print "Failed in calling %s: %s" % (function, e.msg)