diff --git a/src/tashi/util.py b/src/tashi/util.py
index c2bd6b8..8d02822 100644
--- a/src/tashi/util.py
+++ b/src/tashi/util.py
@@ -349,6 +349,11 @@
 			self.connection = None
 			raise
 
+		# if we get a remote exception, raise it locally
+		if (type(returns) is Exception) or \
+		  (type(returns) is TashiException):
+			raise returns
+
 		return returns
 
 	def __getattr__(self, name):